[android] Clean up test_runner.py arguments.

This includes:
  - reformatting
  - purging dead / deprecated / unused arguments

Review-Url: https://codereview.chromium.org/2605083002
Cr-Original-Commit-Position: refs/heads/master@{#456835}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 761f60864c37e7af6fe9dba49256a8b014860049

android/pylib/local/device/local_device_environment.py

@@ -10,12 +10,14 @@ import shutil
 import tempfile
 import threading
 
+import devil_chromium
 from devil import base_error
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import logcat_monitor
+from devil.android.sdk import adb_wrapper
 from devil.utils import file_utils
 from devil.utils import parallelizer
 from pylib import constants
@@ -94,6 +96,15 @@ class LocalDeviceEnvironment(environment.Environment):
     self._tool_name = args.tool
     self._trace_output = args.trace_output
 
+    devil_chromium.Initialize(
+        output_directory=constants.GetOutDirectory(),
+        adb_path=args.adb_path)
+
+    # Some things such as Forwarder require ADB to be in the environment path.
+    adb_dir = os.path.dirname(adb_wrapper.AdbWrapper.GetAdbPath())
+    if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
+      os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']
+
   #override
   def SetUp(self):
     if self.trace_output:

android/pylib/local/machine/local_machine_environment.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import devil_chromium
+from pylib import constants
 from pylib.base import environment
 
 
@@ -10,6 +12,9 @@ class LocalMachineEnvironment(environment.Environment):
   def __init__(self, _args, _error_func):
     super(LocalMachineEnvironment, self).__init__()
 
+    devil_chromium.Initialize(
+        output_directory=constants.GetOutDirectory())
+
   #override
   def SetUp(self):
     pass