[Android] Implement instrumentation tests in platform mode.

build/android/PRESUBMIT.py

 # Copyright (c) 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.
 
 """Presubmit script for android buildbot.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
 details on the presubmit API built into gcl.
 """
 
@@ skipping 45 matching lines @@
   pylib_test_env.update({
       'PYTHONPATH': input_api.PresubmitLocalPath(),
       'PYTHONDONTWRITEBYTECODE': '1',
   })
   output.extend(input_api.canned_checks.RunUnitTests(
       input_api,
       output_api,
       unit_tests=[
           J('pylib', 'device', 'device_utils_test.py'),
           J('pylib', 'gtest', 'gtest_test_instance_test.py'),
-          J('pylib', 'instrumentation', 'test_runner_test.py'),
+          J('pylib', 'instrumentation',
+            'instrumentation_test_instance_test.py'),
           J('pylib', 'results', 'json_results_test.py'),
           J('pylib', 'utils', 'md5sum_test.py'),
       ],
       env=pylib_test_env))
   output.extend(_CheckDeletionsOnlyFiles(input_api, output_api))
   return output
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return CommonChecks(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return CommonChecks(input_api, output_api)