Android Add _incremental targets for instrumentation tests

testing/test.gni

Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index 1c2a927717f99bd565aaa2db1ed20d0919b2f263..f140fa3eb68db3fa88e263828093db8cf85e9c0f 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -85,6 +85,7 @@ template("test") {
     }
     test_runner_script_name = "${_test_name}__test_runner_script"
     test_runner_script(test_runner_script_name) {
+      apk_target = ":$apk_name"
       test_name = _test_name
       test_type = "gtest"
       test_suite = _test_name
@@ -95,6 +96,7 @@ template("test") {
     incremental_test_runner_script_name =
         "${_test_name}_incremental__test_runner_script"
     test_runner_script(incremental_test_runner_script_name) {
+      apk_target = ":$apk_name"
       test_name = "${_test_name}_incremental"
       test_type = "gtest"
       test_suite = _test_name