GN: Merge apk_deps and deps in test() template

testing/test.gni

Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index a6daf7e5cc6f25c4b8f49afd10d09df891f2ae82..46fc7a13d55d58272d65842a36b3331423fad8a3 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -28,6 +28,7 @@ template("test") {
 
       # Don't use "*" to forward all variables since some (like output_name
       # and isolate_file) apply only to the APK below.
+      deps = []
       forward_variables_from(invoker,
                              [
                                "all_dependent_configs",
@@ -40,6 +41,7 @@ template("test") {
                                "data_deps",
                                "datadeps",
                                "defines",
+                               "deps",
                                "include_dirs",
                                "ldflags",
                                "lib_dirs",
@@ -53,29 +55,21 @@ template("test") {
                                "visibility",
                              ])
 
-      deps = []
       if (!defined(invoker.use_default_launcher) ||
           invoker.use_default_launcher) {
         deps += [ "//testing/android/native_test:native_test_native_code" ]
       }
-      if (defined(invoker.deps)) {
-        deps += invoker.deps
-      }
     }
 
     unittest_apk(apk_name) {
+      forward_variables_from(invoker, [ "deps" ])
       unittests_dep = ":$library_name"
       apk_name = main_target_name
       if (defined(invoker.output_name)) {
         apk_name = invoker.output_name
         unittests_binary = "lib${apk_name}.so"
       }
-      deps = [
-        ":$library_name",
-      ]
-      if (defined(invoker.apk_deps)) {
-        deps += invoker.apk_deps
-      }
+      deps += [ ":$library_name" ]
       if (defined(invoker.apk_asset_location)) {
         asset_location = invoker.apk_asset_location
       }