diff --git a/apex/Android.bp b/apex/Android.bp
index d911ad3..dc22628 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -25,9 +25,7 @@
     name: "com.android.media-defaults",
     updatable: true,
     bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],
-    java_libs: [
-      "service-media-s",
-    ],
+    systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"],
     multilib: {
         first: {
             // Extractor process runs only with the primary ABI.
@@ -101,6 +99,13 @@
     apex_available: ["com.android.media"],
 }
 
+// Encapsulate the contributions made by the com.android.media to the systemserverclasspath.
+systemserverclasspath_fragment {
+    name: "com.android.media-systemserverclasspath-fragment",
+    contents: ["service-media-s"],
+    apex_available: ["com.android.media"],
+}
+
 filegroup {
     name: "com.android.media-androidManifest",
     srcs: ["AndroidManifest-media.xml"],