diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 83618c0..b6607c5 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -186,17 +186,9 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
 BOARD_VNDK_VERSION := current
 
-# Shims
+# Shim
 TARGET_LD_SHIM_LIBS += \
-    /vendor/lib/libcamera_client.so|/vendor/lib/libcamera_client_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so|/vendor/lib/libui_shim.so \
-    /vendor/lib/libexynoscamera.so|/vendor/lib/libexynoscamera_shim.so
+    /system/bin/mediaserver|/system/lib/libstagefright_shim.so
 
 # Wifi
 BOARD_HAVE_SAMSUNG_WIFI := true
diff --git a/device-common.mk b/device-common.mk
index 8c90d38..8628f94 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -262,9 +262,8 @@ PRODUCT_PACKAGES += \
 
 # Shims
 PRODUCT_PACKAGES += \
-    libcamera_client_shim \
     libexynoscamera_shim \
-    libui_shim
+    libstagefright_shim
 
 # USB
 PRODUCT_PACKAGES += \
diff --git a/shims/libstagefright/Android.bp b/shims/libstagefright/Android.bp
new file mode 100644
index 0000000..f8eda21
--- /dev/null
+++ b/shims/libstagefright/Android.bp
@@ -0,0 +1,36 @@
+cc_library_shared {
+    name: "libstagefright_shim",
+    
+    srcs: [
+        "CameraSource.cpp",
+    ],
+
+    export_shared_lib_headers: [
+        "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
+    ],
+
+    generated_headers: [
+        "android.hardware.graphics.bufferqueue@1.0_genc++_headers",
+        "android.hardware.graphics.bufferqueue@2.0_genc++_headers",
+    ],
+
+    shared_libs: [
+        "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
+        "android.hidl.token@1.0-utils",
+        "libbase",
+        "libcamera_client",
+        "liblog",
+    ],
+
+    include_dirs: [
+        "frameworks/av/include",
+        "frameworks/native/include/media/hardware",
+        "frameworks/native/include/media/openmax",
+        "frameworks/native/libs/arect/include",
+        "frameworks/native/libs/nativebase/include",
+        "frameworks/native/libs/nativewindow/include",
+        "frameworks/av/media/ndk/include",
+    ],
+}
diff --git a/shims/libstagefright/Android.mk b/shims/libstagefright/Android.mk
deleted file mode 100644
index 5ede22e..0000000
--- a/shims/libstagefright/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := CameraSource.cpp
-
-LOCAL_C_INCLUDES := \
-    $(TOP)/frameworks/av/include \
-    $(TOP)/frameworks/native/include/media/hardware \
-    $(TOP)/frameworks/native/include/media/openmax \
-    $(TOP)/frameworks/native/libs/arect/include \
-    $(TOP)/frameworks/native/libs/nativebase/include \
-    $(TOP)/frameworks/native/libs/nativewindow/include \
-    $(TOP)/frameworks/av/media/ndk/include
-
-LOCAL_SHARED_LIBRARIES := \
-    android.hardware.graphics.bufferqueue@1.0 \
-    android.hardware.graphics.bufferqueue@2.0 \
-    android.hidl.token@1.0-utils \
-    libbase \
-    libcamera_client \
-    liblog
-
-LOCAL_MODULE := libstagefright_shim
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PROPRIETARY_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)