GN: Merge apk_deps and deps in test() template

remoting/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/features.gni")
 import("//build/config/ui.gni")
 import("//build/util/version.gni")
 import("//remoting/remoting_version.gni")
 import("//remoting/remoting_enable.gni")
 import("//testing/test.gni")
@@ skipping 139 matching lines @@
     }
 
     if (enable_webrtc) {
       deps += [
         "//third_party/libjingle:libjingle_webrtc",
         "//third_party/libjingle:libpeerconnection",
       ]
     }
 
     if (is_android) {
-      apk_deps = [ "//net/android:net_java" ]
+      deps += [ "//net/android:net_java" ]
     }
   }
 
   if (enable_remoting_host) {
     test("remoting_perftests") {
       sources = [
         "codec/codec_test.cc",
         "codec/codec_test.h",
         "codec/video_encoder_vpx_perftest.cc",
         "test/protocol_perftest.cc",
@@ skipping 15 matching lines @@
 
       if (enable_webrtc) {
         deps += [ "//third_party/libjingle:libjingle_webrtc" ]
       }
     }
   }
 } else {
   group("remoting_unittests") {
   }
 }