diff --git a/config/common.mk b/config/common.mk
index bd0cc817..b64bd1f8 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -189,6 +189,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     rsync
 
+# Stagefright FFMPEG plugin
+PRODUCT_PACKAGES += \
+    libstagefright_soft_ffmpegadec \
+    libstagefright_soft_ffmpegvdec \
+    libFFmpegExtractor \
+    libnamparser
+
 # These packages are excluded from user builds
 ifneq ($(TARGET_BUILD_VARIANT),user)
 
diff --git a/config/common_full.mk b/config/common_full.mk
index ffdb2da1..9f51f809 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -31,13 +31,6 @@ PRODUCT_PACKAGES += \
     libvideoeditor_videofilters \
     libvideoeditorplayer
 
-# Stagefright FFMPEG plugin
-PRODUCT_PACKAGES += \
-    libstagefright_soft_ffmpegadec \
-    libstagefright_soft_ffmpegvdec \
-    libFFmpegExtractor \
-    libnamparser
-
 # Extra tools in CM
 PRODUCT_PACKAGES += \
     vim