diff --git a/android/bazel.go b/android/bazel.go
index 40c971f17..61469dc4a 100644
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -232,6 +232,8 @@ var (
 		"build/bazel/examples/apex/minimal":                  Bp2BuildDefaultTrueRecursively,
 		"build/soong":                                        Bp2BuildDefaultTrue,
 		"build/soong/cc/libbuildversion":                     Bp2BuildDefaultTrue, // Skip tests subdir
+		"build/soong/cc/ndkstubgen":                          Bp2BuildDefaultTrue,
+		"build/soong/cc/symbolfile":                          Bp2BuildDefaultTrue,
 		"cts/common/device-side/nativetesthelper/jni":        Bp2BuildDefaultTrueRecursively,
 		"development/sdk":                                    Bp2BuildDefaultTrueRecursively,
 		"external/arm-optimized-routines":                    Bp2BuildDefaultTrueRecursively,
diff --git a/python/library.go b/python/library.go
index b9201177d..9c92ebd5c 100644
--- a/python/library.go
+++ b/python/library.go
@@ -96,8 +96,8 @@ func pythonLibBp2Build(ctx android.TopDownMutatorContext, modType string) {
 	}
 
 	props := bazel.BazelTargetModuleProperties{
-		// Use the native py_library rule.
-		Rule_class: "py_library",
+		Rule_class:        "py_library",
+		Bzl_load_location: "//build/bazel/rules/python:library.bzl",
 	}
 
 	ctx.CreateBazelTargetModule(props, android.CommonAttributes{