diff --git a/audio/5.0/Android.bp b/audio/5.0/Android.bp
index 27c1ef5..ee023e3 100644
--- a/audio/5.0/Android.bp
+++ b/audio/5.0/Android.bp
@@ -35,11 +35,7 @@
         "MmapBufferInfo",
         "MmapPosition",
         "ParameterValue",
-        "PlaybackTrackMetadata",
-        "RecordTrackMetadata",
         "Result",
-        "SinkMetadata",
-        "SourceMetadata",
         "TimeSpec",
     ],
     gen_java: false,
diff --git a/audio/common/5.0/Android.bp b/audio/common/5.0/Android.bp
index 663f847..c17f144 100644
--- a/audio/common/5.0/Android.bp
+++ b/audio/common/5.0/Android.bp
@@ -39,6 +39,10 @@
         "AudioStreamType",
         "AudioUsage",
         "FixedChannelCount",
+        "PlaybackTrackMetadata",
+        "RecordTrackMetadata",
+        "SinkMetadata",
+        "SourceMetadata",
         "ThreadInfo",
         "Uuid",
     ],