diff --git a/apex/Android.bp b/apex/Android.bp
index 2f4294588d7ad..d0889efc04057 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -149,6 +149,7 @@ stubs_defaults {
     name: "service-module-stubs-srcs-defaults",
     args: mainline_service_stubs_args,
     installable: false,
+    filter_packages: ["com.android."],
     check_api: {
         current: {
             api_file: "api/current.txt",
diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 679c98ddcbb53..5cdcdd335a121 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -17,6 +17,7 @@ filegroup {
     srcs: [
         "java/**/*.java",
     ],
+    path: "java",
 }
 
 java_library {
diff --git a/services/Android.bp b/services/Android.bp
index 52c5993a28626..1ce7dcfff03b2 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -126,6 +126,7 @@ droidstubs {
         " --hide DeprecationMismatch" +
         " --hide HiddenTypedefConstant",
     visibility: ["//visibility:private"],
+    filter_packages: ["com.android."],
     check_api: {
         current: {
             api_file: "api/current.txt",