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

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import urllib
@@ skipping 695 matching lines @@
     if json_results_file:
       args.extend(['--json-results-file', json_results_file])
     if timeout_scale:
       args.extend(['--timeout-scale', timeout_scale])
     if strict_mode:
       args.extend(['--strict-mode', strict_mode])
     if num_retries is not None:
       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:
         args.extend(['--isolate-file-path', isolate_file_path])
       if self.m.chromium.c.BUILD_CONFIG == 'Release':
         args.append('--release')
       if official_build:
         args.extend(['--official-build'])
 
     step_result = self.test_runner(
@@ skipping 527 matching lines @@
     Args:
       step_name: Name of the step.
       args: Testrunner arguments.
     """
     with self.handle_exit_codes():
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       return self.m.python(step_name, script, args, **kwargs)