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

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 959 matching lines @@
 
   Raises:
     Exception: Unknown command name passed in, or an exception from an
         individual test runner.
   """
   command = args.command
 
   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()
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   def get_devices():
     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':
     return _RunMonkeyTests(args, get_devices())
   elif command == 'perf':
     return _RunPerfTests(args, get_devices())
   elif command == 'python':
     return _RunPythonTests(args)
   else:
     raise Exception('Unknown test type.')
@@ skipping 134 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())