diff --git a/core/user_tags.mk b/core/user_tags.mk
index 24f563d53a..77b491fdba 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -315,7 +315,6 @@ GRANDFATHERED_USER_MODULES += \
 	libSR_Semproc \
 	libSR_Session \
 	libSR_Vocabulary \
-	libstagefright \
 	libstagefright_aacdec \
 	libstagefright_aacenc \
 	libstagefright_amrnb_common \
diff --git a/target/product/core.mk b/target/product/core.mk
index bb0b115950..b476e36742 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -98,6 +98,8 @@ PRODUCT_PACKAGES := \
     libspeexresampler \
     libsqlite_jni \
     libssl \
+    libstagefright \
+    libstagefright_chromium_http \
     libstagefright_soft_aacdec \
     libstagefright_soft_aacenc \
     libstagefright_soft_amrdec \