Revert of Run android tests through runtest.py.

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index ca05438781244253c27267d8a55ccc1e1b4fe255..05160524b860f12eecd9939a109e4727326a097f 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -96,31 +96,6 @@
   return revision
 
 
-def _RunTest(options, cmd, suite):
-  """Run test command with runtest.py.
-
-  Args:
-    options: options object.
-    cmd: the command to run.
-    suite: test name.
-  """
-  property_args = bb_utils.EncodeProperties(options)
-  args = [os.path.join(SLAVE_SCRIPTS_DIR, 'runtest.py')] + property_args
-  args += ['--test-platform', 'android']
-  if options.factory_properties.get('generate_gtest_json'):
-    args.append('--generate-json-file')
-    args += ['-o', 'gtest-results/%s' % suite,
-             '--annotate', 'gtest',
-             '--build-number', str(options.build_properties.get('buildnumber',
-                                                                '')),
-             '--builder-name', options.build_properties.get('buildername', '')]
-
-  if options.target == 'Release':
-    args += ['--target', 'Release']
-  args += cmd
-  RunCmd(args, cwd=DIR_BUILD_ROOT)
-
-
 def RunTestSuites(options, suites, suites_options=None):
   """Manages an invocation of test_runner.py for gtests.
 
@@ -146,11 +121,11 @@
 
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
-    cmd = [suite] + args
+    cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
     cmd += suites_options.get(suite, [])
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
-    _RunTest(options, cmd, suite)
+    RunCmd(cmd)
 
 
 def RunChromeDriverTests(options):