Make instrumentation test dependency on a support APK explicit

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 9e8568e779d81c3baecf7bfe02de60f12a706646..45b57568fadf2b723e5b8b7ec65b6a33caa66d63 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1803,6 +1803,9 @@ template("android_apk") {
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
 #   apk_name: Name for final apk.
+#   support_apk_path: Path to a support apk. If present, the test runner script
+#      will install it on the device before running the instrumentation tests.
+#      Should be a path relative to the src root.
 #   final_apk_path: Path to final built apk. Default is
 #     $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
 #   native_libs: List paths of native libraries to include in this apk. If these
@@ -1842,6 +1845,9 @@ template("instrumentation_test_apk") {
       if (defined(invoker.isolate_file)) {
         isolate_file = invoker.isolate_file
       }
+      if (defined(invoker.support_apk_path)) {
+        support_apk_path = invoker.support_apk_path
+      }
     }
   }