Make android's run_instrumentation_suite() use generated wrapper scripts

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "tryserver.chromium.android",
       "--builder",
       "android_amp",
@@ skipping 1337 matching lines @@
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] save ui_touch_selection_unittests (with patch)"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.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 AndroidWebView.apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_android_webview_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.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/AndroidWebView.apk",
-      "--isolate-file-path",
-      "android_webview/android_webview_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 AndroidWebViewTest (with patch)",
+    "name": "Instrumentation test android_webview_test_apk (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.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 ContentShell.apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_content_shell_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.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/ContentShell.apk",
-      "--isolate-file-path",
-      "content/content_shell_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 ContentShellTest (with patch)",
+    "name": "Instrumentation test content_shell_test_apk (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.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 ChromePublic.apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_chrome_public_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.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/ChromePublic.apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTestSupport.apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromiumNetTestSupport.apk",
-      "--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 (with patch)",
+    "name": "Instrumentation test chrome_public_test_apk (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.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 ChromeSyncShell.apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_chrome_sync_shell_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.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/ChromeSyncShell.apk",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
-      "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "Instrumentation test ChromeSyncShellTest (with patch)",
+    "name": "Instrumentation test chrome_sync_shell_test_apk (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
@@ skipping 1149 matching lines @@
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] save base_unittests (without patch)"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.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 AndroidWebView.apk (2)"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_android_webview_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.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/AndroidWebView.apk",
-      "--isolate-file-path",
-      "android_webview/android_webview_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 AndroidWebViewTest (without patch)",
+    "name": "Instrumentation test android_webview_test_apk (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.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 ContentShell.apk (2)"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_content_shell_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.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/ContentShell.apk",
-      "--isolate-file-path",
-      "content/content_shell_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 ContentShellTest (without patch)",
+    "name": "Instrumentation test content_shell_test_apk (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.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 ChromePublic.apk (2)"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_chrome_public_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.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/ChromePublic.apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTestSupport.apk",
-      "--additional-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromiumNetTestSupport.apk",
-      "--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 (without patch)",
+    "name": "Instrumentation test chrome_public_test_apk (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.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 ChromeSyncShell.apk (2)"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "out/Release/bin/run_chrome_sync_shell_test_apk",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.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/ChromeSyncShell.apk",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
-      "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "Instrumentation test ChromeSyncShellTest (without patch)",
+    "name": "Instrumentation test chrome_sync_shell_test_apk (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "junit",
@@ skipping 124 matching lines @@
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "AndroidWebViewTest (retry summary)",
+    "name": "android_webview_test_apk (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ContentShellTest (retry summary)",
+    "name": "content_shell_test_apk (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ChromePublicTest (retry summary)",
+    "name": "chrome_public_test_apk (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ChromeSyncShellTest (retry summary)",
+    "name": "chrome_sync_shell_test_apk (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(1)"
@@ skipping 135 matching lines @@
     "name": "test_report",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@",
-      "@@@SET_BUILD_PROPERTY@failure_hash@\"f70a31cd238c86b35b0a8c2c2d85034113dc9f60\"@@@"
+      "@@@SET_BUILD_PROPERTY@failure_hash@\"be8c5dc263be959372854a68b1cadf8c79c45f22\"@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "1 out of 8 aggregated steps failed. Failures: Step('base_unittests (retry summary)') failed with return_code 1",
     "status_code": 1
   }
 ]