diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7c1671c..a276dbf 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -172,7 +172,9 @@ BOARD_VNDK_VERSION := current
 
 # Shims
 TARGET_LD_SHIM_LIBS += \
-    /vendor/lib/libexynoscamera.so|/vendor/lib/libexynoscamera_shim.so
+    /system/lib/libstagefright.so|libstagefright_shim.so \
+    /system/lib64/libstagefright.so|libstagefright_shim.so \
+    /vendor/lib/libexynoscamera.so|libexynoscamera_shim.so
 
 # Wifi
 BOARD_HAVE_SAMSUNG_WIFI := true
diff --git a/device-common.mk b/device-common.mk
index afe4cbd..14aa40f 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -291,8 +291,8 @@ PRODUCT_PACKAGES += \
 
 # Shims
 PRODUCT_PACKAGES += \
-    libexynoscamera_shim
-    # libstagefright_shim
+    libexynoscamera_shim \
+    libstagefright_shim
 
 # USB
 PRODUCT_PACKAGES += \