Merge AppRTCDemoJUnitTest into android_junit_tests target

webrtc/examples/BUILD.gn

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../build/webrtc.gni")
 if (is_android) {
@@ skipping 84 matching lines @@
 
     java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ]
 
     apk_under_test = ":AppRTCDemo"
 
     deps = [
       ":AppRTCDemo_javalib",
       "//webrtc/api:libjingle_peerconnection_java",
     ]
   }
-
-  junit_binary("AppRTCDemoJUnitTest") {
-    java_files = [
-      "androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java",
-      "androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java",
-    ]
-
-    deps = [
-      ":AppRTCDemo_javalib",
-      "//webrtc/api:libjingle_peerconnection_java",
-      "//webrtc/api:libjingle_peerconnection_jni",
-    ]
-  }
 }
 
 if (is_ios || (is_mac && target_cpu != "x86")) {
   config("warnings_config") {
     # GN orders flags on a target before flags from configs. The default config
     # adds these flags so to cancel them out they need to come from a config and
     # cannot be on the target directly.
     if (is_ios) {
       # Suppress compiler warnings about deprecated that triggered
       # when moving from ios_deployment_target 7.0 to 9.0.
@@ skipping 391 matching lines @@
       "//webrtc/system_wrappers:field_trial_default",
       "//webrtc/system_wrappers:metrics_default",
     ]
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 }