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

build/android/pylib/host_driven/run_python_tests.py

Index: build/android/pylib/host_driven/run_python_tests.py
diff --git a/build/android/pylib/host_driven/run_python_tests.py b/build/android/pylib/host_driven/run_python_tests.py
index c6a3ca037d344cb581403ed7db1292d71ae5042a..0c168ecd15ac6a560a0fabc84135e79a54d0a657 100644
--- a/build/android/pylib/host_driven/run_python_tests.py
+++ b/build/android/pylib/host_driven/run_python_tests.py
@@ -13,8 +13,7 @@ from pylib import android_commands
 from pylib import constants
 from pylib.base.test_result import TestResults
 from pylib.instrumentation import apk_info
-from pylib.instrumentation import run_java_tests
-from pylib.instrumentation.run_java_tests import FatalTestException
+from pylib.instrumentation import test_runner
 
 import python_test_base
 from python_test_caller import CallPythonTest
@@ -61,7 +60,7 @@ def DispatchPythonTests(options):
 
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
-    raise FatalTestException('You have no devices attached or visible!')
+    raise Exception('You have no devices attached or visible!')
   if options.device:
     attached_devices = [options.device]
 
@@ -86,8 +85,8 @@ def DispatchPythonTests(options):
   for device_id in attached_devices:
     logging.debug('Pushing files to device %s', device_id)
     apks = [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)]
-    test_files_copier = run_java_tests.TestRunner(options, device_id,
-                                                  None, False, 0, apks, [])
+    test_files_copier = test_runner.TestRunner(options, device_id, None, False,
+                                               0, apks, [])
     test_files_copier.CopyTestFilesOnce()
 
   # Actually run the tests.