diff --git a/Android.bp b/Android.bp
index 513131a..66a1752 100644
--- a/Android.bp
+++ b/Android.bp
@@ -229,131 +229,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsecnativefeature",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsecnativefeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsecnativefeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsecril-client",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsecril-client.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libhardware_legacy",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsecril-client.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libhardware_legacy",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsemnativecarrierfeature",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsemnativecarrierfeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsemnativecarrierfeature.so",
-            ],
-            shared_libs: [
-                "libexpat",
-                "libcutils",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libprofileparamstorage",
     owner: "samsung",
@@ -376,8 +251,23 @@ cc_prebuilt_library_shared {
                 "libdl",
             ],
         },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libprofileparamstorage.so",
+            ],
+            shared_libs: [
+                "libxml2",
+                "libcutils",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
     },
-    compile_multilib: "32",
+    compile_multilib: "both",
     prefer: true,
     soc_specific: true,
 }
@@ -400,8 +290,19 @@ cc_prebuilt_library_shared {
                 "libdl",
             ],
         },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsecaudiocoreutils.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
     },
-    compile_multilib: "32",
+    compile_multilib: "both",
     prefer: true,
     soc_specific: true,
 }
@@ -428,8 +329,23 @@ cc_prebuilt_library_shared {
                 "libdl",
             ],
         },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libspatializerparamstorage.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libutils",
+                "libprofileparamstorage",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
     },
-    compile_multilib: "32",
+    compile_multilib: "both",
     prefer: true,
     soc_specific: true,
 }
@@ -2124,6 +2040,88 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsecnativefeature",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsecnativefeature.so",
+            ],
+            shared_libs: [
+                "libexpat",
+                "libcutils",
+                "libz",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsecril-client",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsecril-client.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libhardware_legacy",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsemnativecarrierfeature",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsemnativecarrierfeature.so",
+            ],
+            shared_libs: [
+                "libexpat",
+                "libcutils",
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsensorlistener",
     owner: "samsung",
diff --git a/proprietary/vendor/lib/libsecnativefeature.so b/proprietary/vendor/lib/libsecnativefeature.so
deleted file mode 100644
index 953cda5..0000000
Binary files a/proprietary/vendor/lib/libsecnativefeature.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsecril-client.so b/proprietary/vendor/lib/libsecril-client.so
deleted file mode 100644
index 6d9a14e..0000000
Binary files a/proprietary/vendor/lib/libsecril-client.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsemnativecarrierfeature.so b/proprietary/vendor/lib/libsemnativecarrierfeature.so
deleted file mode 100644
index baeb655..0000000
Binary files a/proprietary/vendor/lib/libsemnativecarrierfeature.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libprofileparamstorage.so b/proprietary/vendor/lib64/libprofileparamstorage.so
new file mode 100644
index 0000000..3936334
Binary files /dev/null and b/proprietary/vendor/lib64/libprofileparamstorage.so differ
diff --git a/proprietary/vendor/lib64/libsecaudiocoreutils.so b/proprietary/vendor/lib64/libsecaudiocoreutils.so
new file mode 100644
index 0000000..663c3ba
Binary files /dev/null and b/proprietary/vendor/lib64/libsecaudiocoreutils.so differ
diff --git a/proprietary/vendor/lib64/libspatializerparamstorage.so b/proprietary/vendor/lib64/libspatializerparamstorage.so
new file mode 100644
index 0000000..d759542
Binary files /dev/null and b/proprietary/vendor/lib64/libspatializerparamstorage.so differ
diff --git a/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index 0c579b8..b390c4e 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -102,9 +102,6 @@ PRODUCT_PACKAGES += \
     libSamsungPostProcessConvertor \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
-    libsecnativefeature \
-    libsecril-client \
-    libsemnativecarrierfeature \
     libprofileparamstorage \
     libsecaudiocoreutils \
     libspatializerparamstorage \
@@ -166,6 +163,9 @@ PRODUCT_PACKAGES += \
     libsait_npu_compiler \
     libsec-ril \
     libsec_semRil \
+    libsecnativefeature \
+    libsecril-client \
+    libsemnativecarrierfeature \
     libsensorlistener \
     libskeymaster4device \
     libtoco_graphgen_export \