diff --git a/apex/Android.bp b/apex/Android.bp
index 2cc6fcb..ec0efe6 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,27 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+com_android_media_extractors = [
+    "libaacextractor",
+    "libamrextractor",
+    "libflacextractor",
+    "libmidiextractor",
+    "libmkvextractor",
+    "libmp3extractor",
+    "libmp4extractor",
+    "libmpeg2extractor",
+    "liboggextractor",
+    "libwavextractor",
+]
+
 apex_defaults {
     name: "com.android.media-defaults",
     java_libs: ["updatable-media"],
-    multilib: {
-        first: {
-            // Extractor process runs only with the primary ABI.
-            native_shared_libs: [
-                // Extractor plugins
-                "libaacextractor",
-                "libamrextractor",
-                "libflacextractor",
-                "libmidiextractor",
-                "libmkvextractor",
-                "libmp3extractor",
-                "libmp4extractor",
-                "libmpeg2extractor",
-                "liboggextractor",
-                "libwavextractor",
-            ],
-        },
-    },
     key: "com.android.media.key",
     certificate: ":com.android.media.certificate",
 
@@ -44,6 +39,12 @@
     name: "com.android.media",
     manifest: "manifest.json",
     defaults: ["com.android.media-defaults"],
+    multilib: {
+        first: {
+            // Extractor process runs only with the primary ABI.
+            native_shared_libs: com_android_media_extractors,
+        },
+    },
 }
 
 filegroup {