Reland #4 of Switch Android gtests to use generated wrapper scripts

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 50d960ac09722ca09ca78ff03cdafad39c307729..5cb613cc8a7235357a85a7b48309cc6cd94d4ae3 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -908,8 +908,8 @@
     args.extend(['--blacklist-file', self.blacklist_file])
     if verbose:
       args.append('--verbose')
-    if self.c.BUILD_CONFIG == 'Release':
-      args.append('--release')
+    # TODO(agrieve): Remove once no more tests pass isolate_file_path (contained
+    #     in wrapper scripts).
     if isolate_file_path:
       args.append('--isolate_file_path=%s' % isolate_file_path)
     if gtest_filter:
@@ -921,11 +921,14 @@
           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),
-        ['gtest', '-s', suite] + args,
+        args=args,
+        wrapper_script_suite_name=suite,
         env=self.m.chromium.get_env(),
         **kwargs)