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

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 9f1b22e56dd19e66e84ad72b97b081383bff7490..90210b6cae817d69909853a67420ab67a36cb235 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -15,8 +15,6 @@
 import sys
 import threading
 import unittest
-
-import devil_chromium
 
 from devil import base_error
 from devil.android import apk_helper
@@ -47,10 +45,6 @@
 from pylib.perf import test_runner as perf_test_runner
 from pylib.results import json_results
 from pylib.results import report_results
-
-
-_DEVIL_STATIC_CONFIG_FILE = os.path.abspath(os.path.join(
-    constants.DIR_SOURCE_ROOT, 'build', 'android', 'devil_config.json'))
 
 
 def AddCommonOptions(parser):
@@ -117,19 +111,8 @@
     constants.SetBuildDirectory(args.build_directory)
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
-
-  devil_custom_deps = None
   if args.adb_path:
-    devil_custom_deps = {
-      'adb': {
-        'android_host': [args.adb_path]
-      }
-    }
-
-  devil_chromium.Initialize(
-      output_directory=constants.GetOutDirectory(),
-      custom_deps=devil_custom_deps)
-
+    constants.SetAdbPath(args.adb_path)
   # Some things such as Forwarder require ADB to be in the environment path.
   adb_dir = os.path.dirname(constants.GetAdbPath())
   if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):