diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4fe7b8b..7a7d6de 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -184,8 +184,6 @@ BOARD_VNDK_VERSION := current
 
 # Shims
 TARGET_LD_SHIM_LIBS += \
-    /system/lib/libstagefright.so|libstagefright_shim.so \
-    /system/lib64/libstagefright.so|libstagefright_shim.so \
     /vendor/lib/libexynoscamera.so|libexynoscamera_shim.so
 
 # Wifi
diff --git a/device-common.mk b/device-common.mk
index 14aa40f..2fd3dcd 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -291,8 +291,7 @@ PRODUCT_PACKAGES += \
 
 # Shims
 PRODUCT_PACKAGES += \
-    libexynoscamera_shim \
-    libstagefright_shim
+    libexynoscamera_shim
 
 # USB
 PRODUCT_PACKAGES += \