Upstream changes to python tests.

build/android/pylib/run_python_tests.py

Index: build/android/pylib/run_python_tests.py
diff --git a/build/android/pylib/run_python_tests.py b/build/android/pylib/run_python_tests.py
index 0fc1245d2e47d982774887ab6e459b908bc36501..7d39f482958003aa30571783eee7a39e0107c820 100644
--- a/build/android/pylib/run_python_tests.py
+++ b/build/android/pylib/run_python_tests.py
@@ -95,29 +95,12 @@ def DispatchPythonTests(options):
                     'using first available device')
     attached_devices = attached_devices[:1]
   logging.debug('Running Python tests')
-  sharder = PythonTestSharder(attached_devices, options.shard_retries,
-                              available_tests)
+  sharder = PythonTestSharder(attached_devices, available_tests, options)
   test_results = sharder.RunShardedTests()
 
   return test_results
 
 
-def _RunPythonTests(tests_to_run, device_id):
-  """Runs a list of Python tests serially on one device and returns results.
-
-  Args:
-    tests_to_run: a list of objects inheriting from PythonTestBase.
-    device_id: ID of the device to run tests on.
-
-  Returns:
-    A list of test results, aggregated across all the tests run.
-  """
-  # This is a list of TestResults objects.
-  results = [CallPythonTest(t, device_id, 0) for t in tests_to_run]
-  # Merge the list of TestResults into one TestResults.
-  return TestResults.FromTestResults(results)
-
-
 def _GetTestModules(python_test_root, is_official_build):
   """Retrieve a sorted list of pythonDrivenTests.