GN: Merge apk_deps and deps in test() template

gpu/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # GYP-to-GN project mappings:
 #
 #  gpu.gyp:command_buffer_client => //gpu/command_buffer/client
 #
 #  gpu.gyp:command_buffer_common => //gpu/command_buffer/common
 #
@@ skipping 158 matching lines @@
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 
   libs = []
 
   if (is_android) {
     libs += [ "android" ]
-    apk_deps = [ "//ui/android:ui_java" ]
+    deps += [ "//ui/android:ui_java" ]
   }
 }
 
 # TODO(GYP): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("gpu_unittests_run") {
   testonly = true
   deps = [
     ":gpu_unittests",
   ]
@@ skipping 155 matching lines @@
 if (is_win || is_linux || is_mac) {
   # TODO(GYP): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("angle_end2end_tests_run") {
     testonly = true
     deps = [
       "//third_party/angle/src/tests:angle_end2end_tests",
     ]
   }
 }