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 9a2149213bb722315df830bd23568d1027177b91..1d0ba35fff139a91054d01bf46ae16ff7c710ec9 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -96,29 +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'),
-      '--test-type',
-      suite,
-      '--run-python-script'
-    ] + property_args
-  if options.factory_properties.get('generate_gtest_json'):
-    args.append('--generate-json-file')
-
-  if options.target == 'Release':
-    args += ['--target', 'Release']
-  args += cmd
-  RunCmd(args)
-
-
 def RunTestSuites(options, suites, suites_options=None):
   """Manages an invocation of test_runner.py for gtests.
 
@@ -148,7 +125,7 @@
     cmd += suites_options.get(suite, [])
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
-    _RunTest(options, cmd, suite)
+    RunCmd(cmd)
 
 
 def RunChromeDriverTests(options):