diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 4d6d14d0d9..2acb0dd70f 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -101,7 +101,7 @@ if (is_android) {
 
   rtc_android_library("AppRTCMobile_javalib") {
     testonly = true
-    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
+    android_manifest = "androidapp/AndroidManifest.xml"
 
     sources = [
       "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 47e600aa85..e02f5d4242 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -115,7 +115,7 @@ if (is_android) {
 
   rtc_android_library("NetworkTesterMobile_javalib") {
     testonly = true
-    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
+    android_manifest = "androidapp/AndroidManifest.xml"
 
     sources = [
       "androidapp/src/com/google/media/networktester/MainActivity.java",
diff --git a/webrtc.gni b/webrtc.gni
index 4f1d0017f8..3708345685 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -1002,6 +1002,7 @@ if (is_android) {
       }
 
       no_build_hooks = true
+      not_needed(["android_manifest"])
     }
   }