Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json

Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
index 26987b9d529fb0116337738c91f5f56d528a456c..bf4d0ca3fdd76785363ba9e6f386a66427176b5e 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
@@ -634,35 +634,15 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
-      "[SLAVE_BUILD]/src/out/Release/apks/AppRTCDemo.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 AppRTCDemo.apk"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_AppRTCDemoTest",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/AppRTCDemoTest.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/AppRTCDemo.apk",
-      "--verbose",
-      "--release"
+      "--verbose"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Instrumentation test AppRTCDemoTest"
@@ -671,16 +651,13 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_libjingle_peerconnection_android_unittest",
       "instrumentation",
-      "--test-apk",
-      "[SLAVE_BUILD]/src/out/Release/apks/libjingle_peerconnection_android_unittest.apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--logcat-output-file",
       "/path/to/tmp/",
-      "--verbose",
-      "--release"
+      "--verbose"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Instrumentation test libjingle_peerconnection_android_unittest"