diff --git a/Android.bp b/Android.bp
index d6b5e7e..3ee545e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -494,6 +494,26 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "libcdsprpc",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libcdsprpc.so"],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcdsprpc.so"],
+		},
+	},
+	compile_multilib: "both",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libcirrusspkrprot",
 	owner: "xiaomi",
@@ -1076,6 +1096,26 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "vendor.qti.hardware.dsp@1.0",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so"],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so"],
+		},
+	},
+	compile_multilib: "both",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "vendor.qti.hardware.vpp@1.1",
 	owner: "xiaomi",
@@ -4427,23 +4467,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libcdsprpc",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libcdsprpc.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libcne",
 	owner: "xiaomi",
@@ -7047,23 +7070,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.dsp@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "vendor.qti.hardware.fingerprint@1.0",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
new file mode 100644
index 0000000..cbd37ca
Binary files /dev/null and b/proprietary/vendor/lib/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so
new file mode 100644
index 0000000..2c0e7ce
Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so differ
diff --git a/surya-vendor.mk b/surya-vendor.mk
index fa8f021..48b34f5 100644
--- a/surya-vendor.mk
+++ b/surya-vendor.mk
@@ -295,6 +295,7 @@ PRODUCT_PACKAGES += \
     libbatterylistener \
     libc2d30_bltlib \
     libcdsp_default_listener \
+    libcdsprpc \
     libcirrusspkrprot \
     libcomprcapture \
     libdiag \
@@ -324,6 +325,7 @@ PRODUCT_PACKAGES += \
     libvpphvx \
     libvpplibrary \
     libasphere \
+    vendor.qti.hardware.dsp@1.0 \
     vendor.qti.hardware.vpp@1.1 \
     vendor.qti.hardware.vpp@1.2 \
     vendor.qti.hardware.vpp@1.3 \
@@ -515,7 +517,6 @@ PRODUCT_PACKAGES += \
     libcamxtintlessalgo \
     libcdfw \
     libcdfw_remote_api \
-    libcdsprpc \
     libcne \
     libcneapiclient \
     libcneoplookup \
@@ -669,7 +670,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.data.latency@1.0 \
     vendor.qti.hardware.data.lce@1.0 \
     vendor.qti.hardware.data.qmi@1.0 \
-    vendor.qti.hardware.dsp@1.0 \
     vendor.qti.hardware.fingerprint@1.0 \
     vendor.qti.hardware.fm@1.0_vendor \
     vendor.qti.hardware.mwqemadapter@1.0 \