Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipe_modules/chromium_android/example.expected/gerrit_try_builder_basic.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[SLAVE_BUILD]"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "cleanup index.lock",
@@ skipping 567 matching lines @@
       "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",
       "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",
       "-A",
       "SmallTest",
       "-E",
       "FlakyTest",
       "--screenshot",
-      "--release",
       "--host-driven-root",
       "[SLAVE_BUILD]/src/chrome/test",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+      "--additional-apk",
+      "Additional.apk",
+      "--isolate-file-path",
+      "android_webview/android_webview_test_apk.isolate",
+      "--release",
       "--official-build"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Instrumentation test SmallTest",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@logcat@logging...@@@",
       "@@@STEP_LOG_LINE@logcat@beep@@@",
       "@@@STEP_LOG_LINE@logcat@boop\bbop@@@",
       "@@@STEP_LOG_END@logcat@@@"
     ]
@@ skipping 96 matching lines @@
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "stack_tool_for_asan"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]