diff --git a/Android.bp b/Android.bp
index 6fa3feec674b6..d13205a2e2b99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -875,7 +875,7 @@ stubs_defaults {
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
         ":core_public_api_files",
-        ":updatable-media-srcs-without-aidls",
+        ":updatable-media-srcs",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
     ],
@@ -938,7 +938,7 @@ stubs_defaults {
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
         ":core_public_api_files",
-        ":updatable-media-srcs-without-aidls",
+        ":updatable-media-srcs",
     ],
     srcs_lib: "framework",
     srcs_lib_whitelist_pkgs: packages_to_document,
diff --git a/media/Android.bp b/media/Android.bp
index 4f9671f9936bf..6fa01bfa12937 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -42,13 +42,6 @@ filegroup {
     ],
 }
 
-filegroup {
-    name: "updatable-media-srcs-without-aidls",
-    srcs : [
-        ":mediasession2-srcs-without-aidls",
-    ],
-}
-
 filegroup {
     name: "mediasession2-srcs",
     srcs: [
@@ -67,18 +60,6 @@ filegroup {
     ],
 }
 
-filegroup {
-    name: "mediasession2-srcs-without-aidls",
-    srcs: [
-        ":mediasession2-srcs",
-    ],
-    exclude_srcs: [
-        "apex/java/android/media/IMediaController2.aidl",
-        "apex/java/android/media/IMediaSession2.aidl",
-        "apex/java/android/media/IMediaSession2Service.aidl",
-    ],
-}
-
 filegroup {
     name: "mediaplayer2-srcs",
     srcs: [
@@ -96,6 +77,7 @@ filegroup {
         "apex/java/android/media/BufferingParams.java",
         "apex/java/android/media/ProxyDataSourceCallback.java",
     ],
+    path: "apex/java",
 }
 
 metalava_updatable_media_args = " --error UnhiddenSystemApi " +
@@ -108,7 +90,7 @@ metalava_updatable_media_args = " --error UnhiddenSystemApi " +
 droidstubs {
     name: "updatable-media-stubs",
     srcs: [
-        ":updatable-media-srcs-without-aidls",
+        ":updatable-media-srcs",
         ":framework-media-annotation-srcs",
     ],
     args: metalava_updatable_media_args,
@@ -120,6 +102,7 @@ droidstubs {
 java_library {
     name: "updatable_media_stubs",
     srcs: [":updatable-media-stubs"],
+
     // Ideally, sdk_version here should be "current_system", but "current - 1" is used
     // to avoid dependency cycle with framework.
     sdk_version: "28",