Reland Switch Android gtests to use generated wrapper scripts

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json
index a6da54d0201a72f5a4810ce5f4ed1d75194452f6..aaf229a1e1065655d8e24fdba1553bf0d82c389b 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json
@@ -224,118 +224,190 @@
       "@@@STEP_LOG_LINE@analyze_details@  \"additional_compile_targets\": [], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"breakpad_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_public_test_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_sync_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"junit_unit_tests\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests_apk\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"breakpad_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_public_test_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_sync_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"junit_unit_tests\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests_apk\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"breakpad_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_public_test_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_sync_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"junit_unit_tests\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests_apk\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"android_webview_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"base_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"breakpad_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"cc_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_public_test_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_sync_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"components_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_junit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"junit_unit_tests\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"net_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sql_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"sync_unit_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_base_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_touch_selection_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"unit_tests_apk\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ]@@@",
       "@@@STEP_LOG_LINE@analyze_details@}@@@",
@@ -420,31 +492,49 @@
       "--goma-disable-local-fallback",
       "--",
       "android_webview_test_apk",
+      "android_webview_unittests",
       "android_webview_unittests_apk",
+      "base_unittests",
       "base_unittests_apk",
       "breakpad_unittests_deps",
+      "cc_unittests",
       "cc_unittests_apk",
       "chrome_junit_tests",
       "chrome_public_test_apk",
       "chrome_sync_shell_test_apk",
+      "components_unittests",
       "components_unittests_apk",
+      "content_browsertests",
       "content_browsertests_apk",
       "content_junit_tests",
       "content_shell_test_apk",
+      "content_unittests",
       "content_unittests_apk",
+      "events_unittests",
       "events_unittests_apk",
+      "gl_tests",
       "gl_tests_apk",
+      "gpu_unittests",
       "gpu_unittests_apk",
+      "ipc_tests",
       "ipc_tests_apk",
       "junit_unit_tests",
+      "media_unittests",
       "media_unittests_apk",
+      "net_unittests",
       "net_unittests_apk",
       "sandbox_linux_unittests_deps",
+      "sql_unittests",
       "sql_unittests_apk",
+      "sync_unit_tests",
       "sync_unit_tests_apk",
+      "ui_android_unittests",
       "ui_android_unittests_apk",
+      "ui_base_unittests",
       "ui_base_unittests_apk",
+      "ui_touch_selection_unittests",
       "ui_touch_selection_unittests_apk",
+      "unit_tests",
       "unit_tests_apk"
     ],
     "cwd": "[SLAVE_BUILD]",
@@ -1463,14 +1553,10 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "breakpad_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
@@ -1478,7 +1564,6 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "breakpad_unittests (with patch)"
@@ -1487,21 +1572,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "cc_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_cc_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "cc_unittests (with patch)"
@@ -1510,21 +1590,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "content_browsertests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_content_browsertests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "content_browsertests (with patch)"
@@ -1533,21 +1608,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "content_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_content_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "content_unittests (with patch)"
@@ -1556,21 +1626,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "gpu_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_gpu_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "gpu_unittests (with patch)"
@@ -1579,21 +1644,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "media_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_media_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "media_unittests (with patch)"
@@ -1602,14 +1662,10 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "net_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_net_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
@@ -1619,7 +1675,6 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "net_unittests (with patch)"
@@ -1628,21 +1683,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "sandbox_linux_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "sandbox_linux_unittests (with patch)"
@@ -1651,21 +1701,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "ui_base_unittests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_ui_base_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "ui_base_unittests (with patch)"
@@ -1674,21 +1719,16 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "unit_tests",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_unit_tests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
-      "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "unit_tests (with patch)"