Revert of Reland Switch Android gtests to use generated wrapper scripts

scripts/slave/recipes/chromium.expected/full_chromium_webkit_Android_Builder.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.webkit",
       "--builder",
       "Android Builder",
@@ skipping 243 matching lines @@
       "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-dir",
       "[SLAVE_BUILD]/src/build/goma/client",
       "--",
-      "blink_heap_unittests",
       "blink_heap_unittests_apk",
       "blink_tests",
-      "webkit_unit_tests",
       "webkit_unit_tests_apk"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "compile",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
@@ skipping 50 matching lines @@
     "~followup_annotations": [
       "@@@STEP_TEXT@WebKit Android (Nexus4)@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]