diff --git a/apex/Android.bp b/apex/Android.bp
index eee26ae..449d29c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,7 +21,9 @@
         "libamrextractor",
         "libflacextractor",
         "libmidiextractor",
+        "libmkvextractor",
         "libmp3extractor",
+        "libmp4extractor",
         "libwavextractor",
     ],
     key: "com.android.media.key",
diff --git a/services/mediaextractor/Android.mk b/services/mediaextractor/Android.mk
index 7c9c727..dddd960 100644
--- a/services/mediaextractor/Android.mk
+++ b/services/mediaextractor/Android.mk
@@ -40,8 +40,6 @@
 
 # extractor libraries
 LOCAL_REQUIRED_MODULES += \
-    libmkvextractor \
-    libmp4extractor \
     libmpeg2extractor \
     liboggextractor \