[Android] Switch instrumentation tests to platform mode. (RELAND 2)

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index eed5c4d18806d728e69e28983704d5414b314241..e55f8c0cdb3651aac177fe9f21a0c2bcd9477993 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -977,7 +977,7 @@ def RunTestsCommand(args): # pylint: disable=too-many-return-statements
   ProcessCommonOptions(args)
   logging.info('command: %s', ' '.join(sys.argv))
 
-  if args.enable_platform_mode:
+  if args.enable_platform_mode or command in ('gtest', 'instrumentation'):
     return RunTestsInPlatformMode(args)
 
   forwarder.Forwarder.RemoveHostLog()
@@ -988,12 +988,8 @@ def RunTestsCommand(args): # pylint: disable=too-many-return-statements
     return _GetAttachedDevices(args.blacklist_file, args.test_device,
                                args.enable_device_cache)
 
-  if command == 'gtest':
-    return RunTestsInPlatformMode(args)
-  elif command == 'linker':
+  if command == 'linker':
     return _RunLinkerTests(args, get_devices())
-  elif command == 'instrumentation':
-    return _RunInstrumentationTests(args, get_devices())
   elif command == 'junit':
     return _RunJUnitTests(args)
   elif command == 'monkey':