diff --git a/Android.bp b/Android.bp
index 13d0e23..8dc64b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11467,6 +11467,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libsensorlistener.so",
             ],
             shared_libs: [
+                "libshim_sensorndkbridge",
                 "libcutils",
                 "libutils",
                 "libsensorndkbridge",
@@ -11484,35 +11485,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsensorndkbridge",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsensorndkbridge.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libhidlbase",
-                "libutils",
-                "android.frameworks.sensorservice@1.0",
-                "android.hardware.sensors@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libsndmonitor",
     owner: "samsung",
@@ -11990,6 +11962,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/unihal_main@2.15.so",
             ],
             shared_libs: [
+                "libshim_sensorndkbridge",
                 "libui_shim",
                 "libutils",
                 "libcutils",
diff --git a/proprietary/vendor/lib/libsensorlistener.so b/proprietary/vendor/lib/libsensorlistener.so
index 40ce0d9..c708083 100644
Binary files a/proprietary/vendor/lib/libsensorlistener.so and b/proprietary/vendor/lib/libsensorlistener.so differ
diff --git a/proprietary/vendor/lib/libsensorndkbridge.so b/proprietary/vendor/lib/libsensorndkbridge.so
deleted file mode 100644
index e2f2819..0000000
Binary files a/proprietary/vendor/lib/libsensorndkbridge.so and /dev/null differ
diff --git a/proprietary/vendor/lib/unihal_main@2.15.so b/proprietary/vendor/lib/unihal_main@2.15.so
index f9f40fc..4c6869b 100644
Binary files a/proprietary/vendor/lib/unihal_main@2.15.so and b/proprietary/vendor/lib/unihal_main@2.15.so differ
diff --git a/sm7125-common-vendor.mk b/sm7125-common-vendor.mk
index 0214386..5dda807 100644
--- a/sm7125-common-vendor.mk
+++ b/sm7125-common-vendor.mk
@@ -431,7 +431,6 @@ PRODUCT_PACKAGES += \
     libsecaudiocoreutils \
     libsecaudioinfo \
     libsensorlistener \
-    libsensorndkbridge \
     libsndmonitor \
     libspatializerparamstorage \
     libspkrprot \