Generate Android .isolate files used for test()s

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 61e5f97326d19f0c28474e7c298029b91dfd3db8..17c976f9677400b0aeb04fd61af3bf6bd5c1ecdb 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -2095,6 +2095,7 @@ template("test_runner_script") {
     depfile = "$target_gen_dir/$target_name.d"
 
     data_deps += [ "//build/android:test_runner_py" ]
+    data = []
 
     test_runner_args = [
       _test_type,
@@ -2179,6 +2180,7 @@ template("test_runner_script") {
       }
     }
     if (defined(invoker.isolate_file)) {
+      data += [ invoker.isolate_file ]
       test_runner_args += [
         "--isolate-file-path",
         rebase_path(invoker.isolate_file, root_build_dir),
@@ -2209,9 +2211,7 @@ template("test_runner_script") {
       depfile,
       generated_script,
     ]
-    data = [
-      generated_script,
-    ]
+    data += [ generated_script ]
 
     args = [
       "--depfile",