Revert of Switch Android gtests to use generated wrapper scripts

scripts/slave/recipe_modules/chromium_android/api.py

 # 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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import urllib
@@ skipping 890 matching lines @@
          '-w', self.m.path['slave_build']] + args, **kwargs)
 
   def run_test_suite(self, suite, verbose=True, isolate_file_path=None,
                      gtest_filter=None, tool=None, flakiness_dashboard=None,
                      name=None, json_results_file=None, shard_timeout=None,
                      args=None, **kwargs):
     args = args or []
     args.extend(['--blacklist-file', self.blacklist_file])
     if verbose:
       args.append('--verbose')
-    # TODO(agrieve): Remove once no more tests pass isolate_file_path (contained
-    #     in wrapper scripts).
+    if self.c.BUILD_CONFIG == 'Release':
+      args.append('--release')
     if isolate_file_path:
       args.append('--isolate_file_path=%s' % isolate_file_path)
     if gtest_filter:
       args.append('--gtest_filter=%s' % gtest_filter)
     if tool:
       args.append('--tool=%s' % tool)
     if flakiness_dashboard:
       args.append('--flakiness-dashboard-server=%s' %
           flakiness_dashboard)
     if json_results_file:
       args.extend(['--json-results-file', json_results_file])
-    # TODO(agrieve): Remove once no more tests pass shard_timeout (contained in
-    #     wrapper scripts).
     if shard_timeout:
       args.extend(['-t', str(shard_timeout)])
     self.test_runner(
         name or str(suite),
-        args=args,
-        wrapper_script_suite_name=suite,
+        ['gtest', '-s', suite] + args,
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_java_unit_test_suite(self, suite, verbose=True,
                                json_results_file=None, suffix=None, **kwargs):
     args = []
     if verbose:
       args.append('--verbose')
     if self.c.BUILD_CONFIG == 'Release':
       args.append('--release')
@@ skipping 313 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)