diff --git a/Android.bp b/Android.bp
index 229e125..724c1f4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,25 +21,6 @@ cc_prebuilt_library_shared {
         none: true,
     },
     target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libutils",
-                "vendor.samsung.hardware.bluetooth@2.0",
-                "android.hardware.bluetooth@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
         android_arm64: {
             srcs: [
                 "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so",
@@ -60,174 +41,12 @@ cc_prebuilt_library_shared {
             ],
         },
     },
-    compile_multilib: "both",
+    compile_multilib: "64",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libswdap",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/soundfx/libswdap.so",
-            ],
-            shared_libs: [
-                "libaudioutils",
-                "libcutils",
-                "liblog",
-                "libutils",
-                "libprofileparamstorage",
-                "libspatializerparamstorage",
-                "libsecaudiocoreutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/soundfx/libswdap.so",
-            ],
-            shared_libs: [
-                "libaudioutils",
-                "libcutils",
-                "liblog",
-                "libutils",
-                "libprofileparamstorage",
-                "libspatializerparamstorage",
-                "libsecaudiocoreutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    relative_install_path: "soundfx",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.bluetooth.a2dp@1.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.bluetooth@2.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so",
-            ],
-            shared_libs: [
-                "android.hardware.bluetooth@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so",
-            ],
-            shared_libs: [
-                "android.hardware.bluetooth@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "lib_SamsungRec_07020",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/lib_SamsungRec_07020.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libm",
-                "libdl",
-                "liblog",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "camera.exynos990",
     owner: "samsung",
@@ -707,6 +526,95 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libswdap",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/soundfx/libswdap.so",
+            ],
+            shared_libs: [
+                "libaudioutils",
+                "libcutils",
+                "liblog",
+                "libutils",
+                "libprofileparamstorage",
+                "libspatializerparamstorage",
+                "libsecaudiocoreutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "soundfx",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.bluetooth.a2dp@1.0",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.bluetooth@2.0",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so",
+            ],
+            shared_libs: [
+                "android.hardware.bluetooth@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 android_app_import {
     name: "HotwordEnrollmentOKGoogleEx2CORTEXM4",
     owner: "samsung",
diff --git a/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
deleted file mode 100644
index 7e45e86..0000000
Binary files a/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so and /dev/null differ
diff --git a/proprietary/vendor/lib/lib_SamsungRec_07020.so b/proprietary/vendor/lib/lib_SamsungRec_07020.so
deleted file mode 100644
index bd7a38a..0000000
Binary files a/proprietary/vendor/lib/lib_SamsungRec_07020.so and /dev/null differ
diff --git a/proprietary/vendor/lib/soundfx/libswdap.so b/proprietary/vendor/lib/soundfx/libswdap.so
deleted file mode 100644
index e77ce32..0000000
Binary files a/proprietary/vendor/lib/soundfx/libswdap.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so b/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so
deleted file mode 100644
index 56dce4b..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so b/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so
deleted file mode 100644
index ba72bd9..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so and /dev/null differ
diff --git a/r8s-vendor.mk b/r8s-vendor.mk
index 8615744..79a9898 100644
--- a/r8s-vendor.mk
+++ b/r8s-vendor.mk
@@ -68,10 +68,6 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl-qti \
-    libswdap \
-    vendor.samsung.hardware.bluetooth.a2dp@1.0 \
-    vendor.samsung.hardware.bluetooth@2.0 \
-    lib_SamsungRec_07020 \
     camera.exynos990 \
     libbauthserver \
     libbauthtzcommon \
@@ -88,6 +84,9 @@ PRODUCT_PACKAGES += \
     libwrappergps \
     sensors.grip \
     sensors.sensorhub \
+    libswdap \
+    vendor.samsung.hardware.bluetooth.a2dp@1.0 \
+    vendor.samsung.hardware.bluetooth@2.0 \
     HotwordEnrollmentOKGoogleEx2CORTEXM4 \
     HotwordEnrollmentXGoogleEx2CORTEXM4 \
     android.hardware.bluetooth@1.0-service-qti \