[Android] Split out the instrumentation test runner, sharder, and dispatcher.

build/android/pylib/host_driven/python_test_base.py

Index: build/android/pylib/host_driven/python_test_base.py
diff --git a/build/android/pylib/host_driven/python_test_base.py b/build/android/pylib/host_driven/python_test_base.py
index 3380ca80958c4b1a89d210e583bc9b367e0a1087..c2d0f69513d5a8c736c357116ad6005631eb6506 100644
--- a/build/android/pylib/host_driven/python_test_base.py
+++ b/build/android/pylib/host_driven/python_test_base.py
@@ -26,7 +26,7 @@ import time
 from pylib import android_commands
 from pylib.base.test_result import SingleTestResult, TestResults
 from pylib.instrumentation import apk_info
-from pylib.instrumentation.run_java_tests import TestRunner
+from pylib.instrumentation import test_runner
 
 
 # aka the parent of com.google.android
@@ -77,10 +77,9 @@ class PythonTestBase(object):
     test = self._ComposeFullTestName(fname, suite, test)
     apks = [apk_info.ApkInfo(self.options.test_apk_path,
             self.options.test_apk_jar_path)]
-    java_test_runner = TestRunner(self.options, self.device_id, [test], False,
-                                  self.shard_index,
-                                  apks,
-                                  self.ports_to_forward)
+    java_test_runner = test_runner.TestRunner(self.options, self.device_id,
+                                              [test], False, self.shard_index,
+                                              apks, self.ports_to_forward)
     return java_test_runner.Run()
 
   def _RunJavaTests(self, fname, tests):