diff --git a/Android.bp b/Android.bp
index f9869f0..069ec8b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -468,318 +468,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libOmxAacDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAlacDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAlacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAlacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAmrDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrwbplusDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrwbplusDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxAmrwbplusDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxApeDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxApeDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxApeDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxEvrcDec",
-    owner: "xiaomi",
-    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: "libOmxQcelp13Dec",
-    owner: "xiaomi",
-    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: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxWmaDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libOmxWmaDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libOpenCL",
     owner: "xiaomi",
@@ -2458,41 +2146,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmm-color-convertor",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libmm-color-convertor.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libmm-color-convertor.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libmm-hdcpmgr",
     owner: "xiaomi",
@@ -4499,33 +4152,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmmosal_proprietary",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libmmosal_proprietary.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libsmwrapper",
     owner: "xiaomi",
diff --git a/msm8953-common-vendor.mk b/msm8953-common-vendor.mk
index 6f38231..a9aff95 100644
--- a/msm8953-common-vendor.mk
+++ b/msm8953-common-vendor.mk
@@ -107,14 +107,6 @@ PRODUCT_PACKAGES += \
     vulkan.msm8953 \
     libC2D2 \
     libCB \
-    libOmxAacDec \
-    libOmxAlacDec \
-    libOmxAmrDec \
-    libOmxAmrwbplusDec \
-    libOmxApeDec \
-    libOmxEvrcDec \
-    libOmxQcelp13Dec \
-    libOmxWmaDec \
     libOpenCL \
     libQSEEComAPI \
     libacdb-fts \
@@ -155,7 +147,6 @@ PRODUCT_PACKAGES += \
     libmdmdetect \
     libmdsprpc \
     libminksocket \
-    libmm-color-convertor \
     libmm-hdcpmgr \
     libperipheral_client \
     libqcci_legacy \
@@ -201,7 +192,6 @@ PRODUCT_PACKAGES += \
     libadm \
     libadpcmdec \
     libdrc \
-    libmmosal_proprietary \
     libsmwrapper \
     libsurround_3mic_proc \
     libvqzip \
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
deleted file mode 100644
index 9bba0ac..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 9c3a2ec..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 1303f2b..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 92f1b1d..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 676598d..0000000
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxEvrcDec.so b/proprietary/vendor/lib/libOmxEvrcDec.so
deleted file mode 100644
index ca8233d..0000000
Binary files a/proprietary/vendor/lib/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
deleted file mode 100644
index 07124ae..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 fa3cad3..0000000
Binary files a/proprietary/vendor/lib/libOmxWmaDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libmm-color-convertor.so b/proprietary/vendor/lib/libmm-color-convertor.so
deleted file mode 100644
index 4a2e8c5..0000000
Binary files a/proprietary/vendor/lib/libmm-color-convertor.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libmmosal_proprietary.so b/proprietary/vendor/lib/libmmosal_proprietary.so
deleted file mode 100644
index 427a991..0000000
Binary files a/proprietary/vendor/lib/libmmosal_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
deleted file mode 100644
index 9f9f0b7..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 451dda5..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 9c22b40..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 23dd1ca..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 99a0bfe..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 0a892c4..0000000
Binary files a/proprietary/vendor/lib64/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
deleted file mode 100644
index 8e24dbf..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 8542ba3..0000000
Binary files a/proprietary/vendor/lib64/libOmxWmaDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libmm-color-convertor.so b/proprietary/vendor/lib64/libmm-color-convertor.so
deleted file mode 100644
index 95353d8..0000000
Binary files a/proprietary/vendor/lib64/libmm-color-convertor.so and /dev/null differ