GN: Merge apk_deps and deps in test() template

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index eb4c38fe50eca0d4f9c52608d7c44060090a0cb7..f6b5209d4b7b38736c423fe08f8e623c653ea9f8 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -691,13 +691,13 @@ test("media_unittests") {
 
   if (is_android) {
     isolate_file = "media_unittests.isolate"
-    deps += [ "//media/base/android:unittests" ]
     sources -= [
       "filters/decrypting_audio_decoder_unittest.cc",
       "filters/decrypting_video_decoder_unittest.cc",
     ]
-    apk_deps = [
+    deps += [
       "//media/base/android:media_java",
+      "//media/base/android:unittests",
       "//ui/android:ui_java",
     ]
   }