Merge "Handle bad rename" into main
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 9059125..bfc9b9e 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -897,6 +897,13 @@
 
 		// java_resources with multiple resource_dirs
 		"emma",
+
+		// NDK STL
+		"ndk_libc++abi",
+		"ndk_libunwind",
+		"ndk_libc++_static",
+		"ndk_libc++_shared",
+		"ndk_system",
 	}
 
 	Bp2buildModuleTypeAlwaysConvertList = []string{