diff --git a/Android.bp b/Android.bp
index 2652ea7..872dc7f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -468,371 +468,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libOmxAacDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAlacDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAlacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAlacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAmrDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrwbplusDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrwbplusDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAmrwbplusDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxApeDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxApeDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxApeDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxEvrcDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxEvrcDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxEvrcDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxG711Dec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxG711Dec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxG711Dec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxQcelp13Dec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxQcelp13Dec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxQcelp13Dec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxWmaDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxWmaDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxWmaDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libOpenCL",
     owner: "motorola",
@@ -2744,33 +2379,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libOmxDsdDec",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxDsdDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libacdb-fts",
     owner: "motorola",
@@ -3086,31 +2694,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libdsd2pcm",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libdsd2pcm.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libgcs-calwrapper",
     owner: "motorola",
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
deleted file mode 100644
index f731135..0000000
Binary files a/proprietary/vendor/lib/libOmxAacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAlacDec.so b/proprietary/vendor/lib/libOmxAlacDec.so
deleted file mode 100644
index 70b5578..0000000
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAmrDec.so b/proprietary/vendor/lib/libOmxAmrDec.so
deleted file mode 100644
index 275b30a..0000000
Binary files a/proprietary/vendor/lib/libOmxAmrDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
deleted file mode 100644
index 7e79489..0000000
Binary files a/proprietary/vendor/lib/libOmxAmrwbplusDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxApeDec.so b/proprietary/vendor/lib/libOmxApeDec.so
deleted file mode 100644
index 0d8218d..0000000
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxDsdDec.so b/proprietary/vendor/lib/libOmxDsdDec.so
deleted file mode 100644
index fb8785c..0000000
Binary files a/proprietary/vendor/lib/libOmxDsdDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxEvrcDec.so b/proprietary/vendor/lib/libOmxEvrcDec.so
deleted file mode 100644
index 952ca8d..0000000
Binary files a/proprietary/vendor/lib/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxG711Dec.so b/proprietary/vendor/lib/libOmxG711Dec.so
deleted file mode 100644
index ef2baed..0000000
Binary files a/proprietary/vendor/lib/libOmxG711Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
deleted file mode 100644
index 9759661..0000000
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxWmaDec.so b/proprietary/vendor/lib/libOmxWmaDec.so
deleted file mode 100644
index b8cb8aa..0000000
Binary files a/proprietary/vendor/lib/libOmxWmaDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libdsd2pcm.so b/proprietary/vendor/lib/libdsd2pcm.so
deleted file mode 100644
index 488b342..0000000
Binary files a/proprietary/vendor/lib/libdsd2pcm.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
deleted file mode 100644
index c95f104..0000000
Binary files a/proprietary/vendor/lib64/libOmxAacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDec.so b/proprietary/vendor/lib64/libOmxAlacDec.so
deleted file mode 100644
index edab743..0000000
Binary files a/proprietary/vendor/lib64/libOmxAlacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAmrDec.so b/proprietary/vendor/lib64/libOmxAmrDec.so
deleted file mode 100644
index 6465e9c..0000000
Binary files a/proprietary/vendor/lib64/libOmxAmrDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so
deleted file mode 100644
index 876329e..0000000
Binary files a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxApeDec.so b/proprietary/vendor/lib64/libOmxApeDec.so
deleted file mode 100644
index f43cd2d..0000000
Binary files a/proprietary/vendor/lib64/libOmxApeDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxEvrcDec.so b/proprietary/vendor/lib64/libOmxEvrcDec.so
deleted file mode 100644
index 7d4507f..0000000
Binary files a/proprietary/vendor/lib64/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxG711Dec.so b/proprietary/vendor/lib64/libOmxG711Dec.so
deleted file mode 100644
index 2db58ac..0000000
Binary files a/proprietary/vendor/lib64/libOmxG711Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
deleted file mode 100644
index a9b1d98..0000000
Binary files a/proprietary/vendor/lib64/libOmxQcelp13Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxWmaDec.so b/proprietary/vendor/lib64/libOmxWmaDec.so
deleted file mode 100644
index 5540d8e..0000000
Binary files a/proprietary/vendor/lib64/libOmxWmaDec.so and /dev/null differ
diff --git a/sm6225-common-vendor.mk b/sm6225-common-vendor.mk
index 86633e6..2337958 100644
--- a/sm6225-common-vendor.mk
+++ b/sm6225-common-vendor.mk
@@ -172,15 +172,6 @@ PRODUCT_PACKAGES += \
     vulkan.adreno \
     libC2D2 \
     libCB \
-    libOmxAacDec \
-    libOmxAlacDec \
-    libOmxAmrDec \
-    libOmxAmrwbplusDec \
-    libOmxApeDec \
-    libOmxEvrcDec \
-    libOmxG711Dec \
-    libOmxQcelp13Dec \
-    libOmxWmaDec \
     libOpenCL \
     libVkLayer_q3dtools \
     libadreno_app_profiles \
@@ -226,7 +217,6 @@ PRODUCT_PACKAGES += \
     btaudio_offload_if \
     vendor.qti.hardware.bluetooth_audio@2.0-impl \
     vendor.qti.hardware.bluetooth_audio@2.1-impl \
-    libOmxDsdDec \
     libacdb-fts \
     libacdbloader \
     libacdbrtac \
@@ -238,7 +228,6 @@ PRODUCT_PACKAGES += \
     libcapiv2svacnn \
     libcapiv2svarnn \
     libcapiv2vop \
-    libdsd2pcm \
     libgcs-calwrapper \
     libgcs-ipc \
     libgcs-osal \