GN: Merge apk_deps and deps in test() template

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index ec2bfcafc5c026426c89e7b902fd86b6828b2369..a65d064fa9f6eea1ecbef23631ec7917ef43698d 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -447,7 +447,7 @@ test("content_browsertests") {
       "//content/shell/android:content_shell_jni_headers",
       "//testing/android/native_test:native_test_support",
     ]
-    apk_deps = [
+    deps += [

[tfarina, 2015/11/20 18:56:06]

merge with the above list now?

[agrieve, 2015/11/20 20:06:14]

Done.

       ":content_browsertests_java",
       ":content_browsertests_manifest",
       "//content/shell/android:content_shell_assets",
@@ -708,7 +708,7 @@ test("content_unittests") {
     ]
     deps -= [ "//device/battery" ]
 
-    apk_deps = [
+    deps += [
       "//base:base_java_unittest_support",
       "//content/public/android:content_java",
       "//v8:v8_external_startup_data_assets",
@@ -830,7 +830,7 @@ test("content_gl_tests") {
   ]
 
   if (is_android) {
-    apk_deps = [
+    deps += [
       "//content/public/test/android:content_java_test_support",
       "//content/shell/android:content_shell_assets",
     ]