Make android's run_instrumentation_suite() use generated wrapper scripts

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

Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
index 71c2d1dfb6e33f8a8733a92f4582880eb471c325..080772d16d1d6b58cfa0ffec9667b9c589a445e1 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
@@ -516,48 +516,22 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/second_apk",
-      "-v",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--release"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "install second_apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/one_apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--logcat-output-file",
       "/path/to/tmp/",
-      "--apk-under-test",
-      "[SLAVE_BUILD]/src/out/Release/apks/second_apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/another_apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/omg_so_many_apks",
-      "--isolate-file-path",
-      "chrome/chrome_public_test_apk.isolate",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
-      "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "Instrumentation test ChromePublicTest",
+    "name": "Instrumentation test chrome_public_test_apk",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]