[Android] Redesigns the sharder to allow replicated vs distributed tests

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 4efb9ae33a46345bc60e8492a1c4dc01534918a6..6a95420167c490c6ba95d0611ec2fa236f4c9c5f 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -17,7 +17,7 @@ import test_package_executable
 
 
 # We're moving to using isolate files instead of harcoding
-# dependencies here. Look at the TODO in dispatch.py.
+# dependencies here. Look at the TODO in setup.py.
 def _GetDataFilesForTestSuite(test_suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
@@ -180,7 +180,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
     self._cleanup_test_files = cleanup_test_files
     self._deps_dir = deps_dir
 
-    logging.warning('Test suite: ' + test_suite)
+    logging.warning('Test suite: ' + str(test_suite))
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = test_package_apk.TestPackageApk(
           self.adb,