Allow run_instrumentation_suite to use --test-apk with a wrapper script

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 315ee413dbe4678f293f53b157fbb9c5601f7efd..7779b8ad9c70beb0f54394f6a6ffa652db4f5be3 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -713,12 +713,13 @@ class AndroidApi(recipe_api.RecipeApi):
       args.extend(['--num-retries', str(num_retries)])
     if device_flags:
       args.extend(['--device-flags', device_flags])
+    if test_apk:
+      args.extend(['--test-apk', test_apk])
+    if apk_under_test:
+      args.extend(['--apk-under-test', apk_under_test])
 
     if not wrapper_script_suite_name:
       args.insert(0, 'instrumentation')
-      args.extend(['--test-apk', test_apk])
-      if apk_under_test:
-        args.extend(['--apk-under-test', apk_under_test])
       for a in additional_apks or []:
         args.extend(['--additional-apk', a])
       if isolate_file_path: