diff --git a/device-common.mk b/device-common.mk
index a940f26..7f99782 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -97,6 +97,10 @@
 PRODUCT_PACKAGES += \
     keystore.grouper
 
+# http://b/15193147
+# TODO(danalbert): Remove this once stlport is dead and gone.
+PRODUCT_PACKAGES +=  libstlport
+
 # NFC packages
 PRODUCT_PACKAGES += \
     nfc.grouper \