Revert of https://codereview.webrtc.org/2889183002/

webrtc/webrtc.gni

 # Copyright (c) 2014 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/config/arm.gni")
 import("//build/config/features.gni")
@@ skipping 248 matching lines @@
                              "public_configs",
                              "suppressed_configs",
                            ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
     public_configs = [ rtc_common_inherited_config ]
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
-    if (!build_with_chromium && is_android) {
-      android_manifest = "//webrtc/test/android/AndroidManifest.xml"
-      deps += [ "//webrtc/test:native_test_java" ]
-    }
   }
 }
 
 template("rtc_source_set") {
   source_set(target_name) {
     forward_variables_from(invoker,
                            "*",
                            [
                              "configs",
                              "public_configs",
@@ skipping 89 matching lines @@
       configs += invoker.configs
       configs -= rtc_remove_configs
       configs -= invoker.suppressed_configs
       public_configs = [ rtc_common_inherited_config ]
       if (defined(invoker.public_configs)) {
         public_configs += invoker.public_configs
       }
     }
   }
 }