diff --git a/Android.bp b/Android.bp
index 94a9e44..063999d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2163,90 +2163,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libcvp_util",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libcvp_util.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libutils",
-                "libQSEEComAPI",
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcvp_util.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libutils",
-                "libQSEEComAPI",
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libcvpcpuRev_skel",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libcvpcpuRev_skel.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libcdsprpc",
-                "libion",
-                "libcvp_common",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcvpcpuRev_skel.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libcdsprpc",
-                "libion",
-                "libcvp_common",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libdiag",
     owner: "motorola",
@@ -5034,49 +4950,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.cvp@1.0",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.cvp@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.qti.hardware.dsp@1.0",
     owner: "motorola",
@@ -8645,6 +8518,61 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libcvp_util",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libcvp_util.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libutils",
+                "libQSEEComAPI",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libcvpcpuRev_skel",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libcvpcpuRev_skel.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libcdsprpc",
+                "libion",
+                "libcvp_common",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libdataitems",
     owner: "motorola",
@@ -12949,6 +12877,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.cvp@1.0",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.qti.hardware.cvp@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.qti.hardware.data.cne.internal.api@1.0",
     owner: "motorola",
diff --git a/proprietary/vendor/lib/libcvp_util.so b/proprietary/vendor/lib/libcvp_util.so
deleted file mode 100644
index 4199a7e..0000000
Binary files a/proprietary/vendor/lib/libcvp_util.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcvpcpuRev_skel.so b/proprietary/vendor/lib/libcvpcpuRev_skel.so
deleted file mode 100644
index 88096fd..0000000
Binary files a/proprietary/vendor/lib/libcvpcpuRev_skel.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so
deleted file mode 100644
index 905e329..0000000
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so and /dev/null differ
diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk
index 70f81e1..d33b9f2 100644
--- a/sm7325-common-vendor.mk
+++ b/sm7325-common-vendor.mk
@@ -370,8 +370,6 @@ PRODUCT_PACKAGES += \
     libconfigdb \
     libcvp2_1 \
     libcvp_common \
-    libcvp_util \
-    libcvpcpuRev_skel \
     libdiag \
     libdsi_netctrl \
     libdsutils \
@@ -437,7 +435,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.diaghal@1.0_vendor \
     vendor.qti.hardware.bluetooth_sar@1.0 \
     vendor.qti.hardware.bluetooth_sar@1.1 \
-    vendor.qti.hardware.cvp@1.0 \
     vendor.qti.hardware.dsp@1.0 \
     vendor.qti.hardware.qconfig@1.0 \
     vendor.qti.hardware.vpp@1.1 \
@@ -547,6 +544,8 @@ PRODUCT_PACKAGES += \
     libcneoplookup \
     libcneqmiutils \
     libcpion \
+    libcvp_util \
+    libcvpcpuRev_skel \
     libdataitems \
     libdisp-aba \
     libdisplayqos \
@@ -688,6 +687,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.gnss@4.2 \
     vendor.qti.hardware.alarm@1.0 \
     vendor.qti.hardware.cacert@1.0 \
+    vendor.qti.hardware.cvp@1.0 \
     vendor.qti.hardware.data.cne.internal.api@1.0 \
     vendor.qti.hardware.data.cne.internal.constants@1.0 \
     vendor.qti.hardware.data.cne.internal.server@1.0 \