Revert of [Android] Add a configurable environment for devil/. (RELAND 2)

Revert of [Android] Add a configurable environment for devil/. (RELAND 2) (patchset #10 id:180001 of https://codereview.chromium.org/1416703003/ )

Reason for revert:
crbug.com/566503


Original issue's description:
> [Android] Add a configurable environment for devil/. (RELAND 2)
> 
> This is a reland of https://codereview.chromium.org/1399273002
> 
> BUG=476719
> 
> Committed: https://crrev.com/0c2a94ab87e6351b924a19932442e85a8f786fa0
> Cr-Commit-Position: refs/heads/master@{#363204}

TBR=aiolos@chromium.org,nednguyen@google.com,mikecase@chromium.org,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=476719

[stevenjb, 2015-12-06 00:20:31]

Created Revert of [Android] Add a configurable environment for devil/. (RELAND
2)

[commit-bot: I haz the power, 2015-12-06 00:21:26]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1502033002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1502033002/1

[commit-bot: I haz the power, 2015-12-06 00:22:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-06 00:22:41]

Failed to apply patch for build/android/incremental_install/installer.py:
While running git apply --index -3 -p1;
  error: patch failed: build/android/incremental_install/installer.py:255
  Falling back to three-way merge...
  Applied patch to 'build/android/incremental_install/installer.py' with
conflicts.
  U build/android/incremental_install/installer.py

Patch:       build/android/incremental_install/installer.py
Index: build/android/incremental_install/installer.py
diff --git a/build/android/incremental_install/installer.py
b/build/android/incremental_install/installer.py
index
ff6e08e089942a04af1c7f83dce624226d94a655..373889df89d30c7b68b5f652674e148035b8ec81
100755
--- a/build/android/incremental_install/installer.py
+++ b/build/android/incremental_install/installer.py
@@ -14,9 +14,7 @@
 import shutil
 import sys
 
-sys.path.append(
-    os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)))
-import devil_chromium
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
 from devil.android import apk_helper
 from devil.android import device_utils
 from devil.android import device_errors
@@ -255,8 +253,6 @@
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
 
-  devil_chromium.Initialize(output_directory=constants.GetOutputDirectory())
-
   if args.device:
     # Retries are annoying when commands fail for legitimate reasons. Might
want
     # to enable them if this is ever used on bots though.

[commit-bot: I haz the power, 2015-12-06 00:23:28]

The CQ bit was unchecked by commit-bot@chromium.org