Make instrumentation test dependency on a support APK explicit

build/android/test_runner.gypi

Index: build/android/test_runner.gypi
diff --git a/build/android/test_runner.gypi b/build/android/test_runner.gypi
index 92f355bf1fb4abe73d3480f728ac5f7ecfd7665b..f92b7cedc0e2cd4e0b75fdcb6d5f298b26b9ac90 100644
--- a/build/android/test_runner.gypi
+++ b/build/android/test_runner.gypi
@@ -33,6 +33,7 @@
   'variables': {
     'variables': {
       'isolate_file%': '',
+      'support_apk_path%': '',
     },
     'test_runner_args': ['--output-directory', '<(PRODUCT_DIR)'],
     'conditions': [
@@ -43,6 +44,14 @@
       ['test_type == "instrumentation"', {
         'test_runner_args': ['--test-apk', '<(apk_name)'],
         'script_name': 'run_<(_target_name)',
+        'conditions': [
+          ['support_apk_path != ""', {
+            'test_runner_args': [
+              '--support-apk',
+              '<(support_apk_path)'
+            ],
+          }],
+        ],
       }],
       ['isolate_file != ""', {
         'test_runner_args': ['--isolate-file-path', '<(isolate_file)']