GN: Merge apk_deps and deps in test() template

ui/gfx/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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 690 matching lines @@
   ]
 
   if (!is_mac && !is_ios) {
     sources += [
       "interpolated_transform_unittest.cc",
       "transform_unittest.cc",
     ]
   }
 
   if (is_android) {
-    apk_deps = [ "//ui/android:ui_java" ]
+    deps += [ "//ui/android:ui_java" ]
 
     sources -= [
       # Do not run display_change_notifier_unittest.cc on Android because it
       # does not compile display_observer.cc
       "display_change_notifier_unittest.cc",
     ]
   }
 
   if (use_aura) {
     sources -= [ "screen_unittest.cc" ]
@@ skipping 32 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }