GN: Merge apk_deps and deps in test() template

ui/base/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/compiler/compiler.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
@@ skipping 797 matching lines @@
       "imm32.lib",
       "oleacc.lib",
     ]
   }
 
   if (is_win) {
     sources += [ "view_prop_unittest.cc" ]
   }
 
   if (is_android) {
-    apk_deps = [
+    deps += [
       "//chrome:resources",
       "//ui/android:ui_java",
     ]
     isolate_file = "ui_base_unittests.isolate"
   }
 
   if (use_pango) {
     configs += [ "//build/config/linux:pangocairo" ]
   }
 
@@ skipping 62 matching lines @@
   }
   if (is_mac) {
     data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
 
     if (is_asan && symbol_level == 0) {
       data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
     }
   }
 }
 # TODO(GYP) Mac (ui_base_tests_bundle)