[Merge to 51] Make the Android test apks depend on their run_ scripts

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 140bd4854f95e2a6af309beb7354259f139a070a..4fc06f2604e53139c84cc31bb618a7eebdba32f9 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -2062,13 +2062,18 @@ template("test_runner_script") {
       defined(invoker.incremental_install) && invoker.incremental_install
 
   action(target_name) {
+    data_deps = []
+    deps = []
+    forward_variables_from(invoker,
+                           [
+                             "data_deps",
+                             "deps",
+                           ])
+
     script = "//build/android/gyp/create_test_runner_script.py"
     depfile = "$target_gen_dir/$target_name.d"
-    deps = []
 
-    datadeps = [
-      "//build/android:test_runner_py",
-    ]
+    data_deps += [ "//build/android:test_runner_py" ]
 
     test_runner_args = [
       _test_type,