[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 0b1dc746357d230762be93da2f42a4d13886c7a1..12f5cdec28c0c0f3cd9991d8bb2cb7cffa70c1ff 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -16,6 +16,8 @@ import sys
 import threading
 import unittest
 
+import devil_chromium
+
 from devil import base_error
 from devil.android import apk_helper
 from devil.android import device_blacklist
@@ -47,6 +49,10 @@ 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):
   """Adds all common options to |parser|."""
 
@@ -110,8 +116,19 @@ def ProcessCommonOptions(args):
     constants.SetBuildDirectory(args.build_directory)
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
+
+  devil_custom_deps = None
   if args.adb_path:
-    constants.SetAdbPath(args.adb_path)
+    devil_custom_deps = {
+      'adb': {
+        'android_host': [args.adb_path]
+      }
+    }
+
+  devil_chromium.Initialize(
+      output_directory=constants.GetOutDirectory(),
+      custom_deps=devil_custom_deps)
+
   # 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):