GN: Merge apk_deps and deps in test() template

ui/android/BUILD.gn

 # Copyright 2015 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/android/rules.gni")
 import("//testing/test.gni")
 
 assert(is_android)
 
 component("android") {
@@ skipping 140 matching lines @@
 }
 
 test("ui_android_unittests") {
   sources = [
     "overscroll_refresh_unittest.cc",
     "resources/resource_manager_impl_unittest.cc",
     "run_all_unittests.cc",
   ]
   deps = [
     ":android",
+    ":ui_java",
     "//base",
     "//base/test:test_support",
     "//cc",
     "//cc:test_support",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/base",
     "//ui/gfx",
     "//ui/resources:ui_test_pak",
   ]
-  apk_deps = [ ":ui_java" ]
 }