diff --git a/libs/usb/Android.bp b/libs/usb/Android.bp
index edc8474..e685a73 100644
--- a/libs/usb/Android.bp
+++ b/libs/usb/Android.bp
@@ -28,4 +28,5 @@
     name: "com.android.future.usb.accessory",
     srcs: ["src/**/*.java"],
     api_packages: ["com.android.future.usb"],
+    dist_group: "android",
 }
diff --git a/location/lib/Android.bp b/location/lib/Android.bp
index 5cd5a59..f99c59c 100644
--- a/location/lib/Android.bp
+++ b/location/lib/Android.bp
@@ -30,4 +30,5 @@
         "androidx.annotation_annotation",
     ],
     api_packages: ["com.android.location.provider"],
+    dist_group: "android",
 }
diff --git a/media/lib/remotedisplay/Android.bp b/media/lib/remotedisplay/Android.bp
index bfb0cb8..e1d7cae 100644
--- a/media/lib/remotedisplay/Android.bp
+++ b/media/lib/remotedisplay/Android.bp
@@ -27,4 +27,5 @@
     name: "com.android.media.remotedisplay",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.media.remotedisplay"],
+    dist_group: "android",
 }
diff --git a/media/lib/signer/Android.bp b/media/lib/signer/Android.bp
index 6504176..65a6073a4 100644
--- a/media/lib/signer/Android.bp
+++ b/media/lib/signer/Android.bp
@@ -27,4 +27,5 @@
     name: "com.android.mediadrm.signer",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.mediadrm.signer"],
+    dist_group: "android",
 }
diff --git a/media/lib/tvremote/Android.bp b/media/lib/tvremote/Android.bp
index 5f9185a..1f3401f 100644
--- a/media/lib/tvremote/Android.bp
+++ b/media/lib/tvremote/Android.bp
@@ -29,5 +29,6 @@
     api_packages: ["com.android.media.tv.remoteprovider"],
     dex_preopt: {
         enabled: false,
-    }
+    },
+    dist_group: "android",
 }
diff --git a/nfc-extras/Android.bp b/nfc-extras/Android.bp
index 43b2830..cb9ac6f 100644
--- a/nfc-extras/Android.bp
+++ b/nfc-extras/Android.bp
@@ -27,4 +27,5 @@
     name: "com.android.nfc_extras",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.nfc_extras"],
+    dist_group: "android",
 }
diff --git a/obex/Android.bp b/obex/Android.bp
index 95eac81..37e7f76 100644
--- a/obex/Android.bp
+++ b/obex/Android.bp
@@ -48,4 +48,5 @@
     name: "javax.obex",
     srcs: ["javax/**/*.java"],
     api_packages: ["javax.obex"],
+    dist_group: "android",
 }
diff --git a/test-base/Android.bp b/test-base/Android.bp
index b58aa11..97ebba6 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -55,6 +55,7 @@
     hiddenapi_additional_annotations: [
         "android.test.base-hiddenapi-annotations",
     ],
+    dist_group: "android",
 }
 
 // Build the android.test.base_static library
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 107292c..460a26d 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -48,6 +48,7 @@
     ],
     compile_dex: true,
     default_to_stubs: true,
+    dist_group: "android",
 }
 
 // Make the current.txt available for use by the cts/tests/signature tests.
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index c380ae3..0f56bb3 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -52,6 +52,7 @@
 
     compile_dex: true,
     default_to_stubs: true,
+    dist_group: "android",
 }
 
 // Build the android.test.runner-minus-junit library