[Android] Fixes for instrumentation in platform mode.

build/android/pylib/local/device/local_device_test_run.py

Index: build/android/pylib/local/device/local_device_test_run.py
diff --git a/build/android/pylib/local/device/local_device_test_run.py b/build/android/pylib/local/device/local_device_test_run.py
index c6d29f48ca35f5356c7270b9ed2400e8dfd8c3ff..53d6f174f4262b2e6affde55411b1eab2c1fb08f 100644
--- a/build/android/pylib/local/device/local_device_test_run.py
+++ b/build/android/pylib/local/device/local_device_test_run.py
@@ -58,7 +58,7 @@ class LocalDeviceTestRun(test_run.TestRun):
             all_fail_results[result.GetName()] = result
 
       results_names = set(r.GetName() for r in results.GetAll())
-      tests = [t for t in tests if t not in results_names]
+      tests = [t for t in tests if self._GetTestName(t) not in results_names]
       tries += 1
 
     all_unknown_test_names = set(tests)
@@ -85,6 +85,9 @@ class LocalDeviceTestRun(test_run.TestRun):
   def _CreateShards(self, tests):
     raise NotImplementedError
 
+  def _GetTestName(self, test):
+    return test
+
   def _GetTests(self):
     raise NotImplementedError