diff --git a/camera/device/aidl/Android.bp b/camera/device/aidl/Android.bp
index bf5bf6310a..00d9da026f 100644
--- a/camera/device/aidl/Android.bp
+++ b/camera/device/aidl/Android.bp
@@ -28,9 +28,6 @@ aidl_interface {
             sdk_version: "module_current",
             enabled: false,
         },
-        rust: {
-            enabled: true,
-        }
     },
     versions_with_info: [
         {
diff --git a/camera/provider/aidl/Android.bp b/camera/provider/aidl/Android.bp
index 19dede0a90..d7e613e657 100644
--- a/camera/provider/aidl/Android.bp
+++ b/camera/provider/aidl/Android.bp
@@ -26,9 +26,6 @@ aidl_interface {
         cpp: {
             enabled: false,
         },
-        rust: {
-            enabled: true,
-        },
     },
     versions_with_info: [
         {
diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 058ddb5f6b..5772b7fa64 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -24,9 +24,14 @@ aidl_interface {
     stability: "vintf",
     backend: {
         java: {
+            // There is no Java FMQ library, but we support the AIDL type
+            // to allow subsets of interfaces that include it to be used in Java
+            enabled: true,
             sdk_version: "module_current",
         },
         cpp: {
+            // FMQ will not be supported in the cpp backend because the parcelables
+            // are not stable enough for use in shared memory
             enabled: false,
         },
         ndk: {
@@ -38,8 +43,9 @@ aidl_interface {
             min_sdk_version: "29",
         },
         rust: {
-            enabled: true,
-        }
+            // FMQ is not supported in the rust backend
+            enabled: false,
+        },
     },
     frozen: true,
     versions: ["1"],