Revert of Switch Android gtests to use generated wrapper scripts

scripts/slave/recipes/cronet.expected/local_test.json

Index: scripts/slave/recipes/cronet.expected/local_test.json
diff --git a/scripts/slave/recipes/cronet.expected/local_test.json b/scripts/slave/recipes/cronet.expected/local_test.json
index 56bcdf7e7cb346a2b446baa3d8cf4f4913485658..1c5732340a11494750afb1bf71b1676dd557a11a 100644
--- a/scripts/slave/recipes/cronet.expected/local_test.json
+++ b/scripts/slave/recipes/cronet.expected/local_test.json
@@ -452,7 +452,10 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_unittests",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "cronet_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
@@ -461,6 +464,7 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
+      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "cronet_unittests"
@@ -469,7 +473,10 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/out/Debug/bin/run_net_unittests",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "net_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
@@ -478,6 +485,7 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
+      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "net_unittests"