diff --git a/proprietary/system_ext/lib/libaptX_encoder.so b/proprietary/system_ext/lib/libaptX_encoder.so
new file mode 100644
index 0000000..b316d32
Binary files /dev/null and b/proprietary/system_ext/lib/libaptX_encoder.so differ
diff --git a/proprietary/product/lib64/libaptXHD_encoder.so b/proprietary/system_ext/lib64/libaptXHD_encoder.so
similarity index 100%
rename from proprietary/product/lib64/libaptXHD_encoder.so
rename to proprietary/system_ext/lib64/libaptXHD_encoder.so
diff --git a/proprietary/product/lib64/libaptX_encoder.so b/proprietary/system_ext/lib64/libaptX_encoder.so
similarity index 100%
rename from proprietary/product/lib64/libaptX_encoder.so
rename to proprietary/system_ext/lib64/libaptX_encoder.so
diff --git a/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so b/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so
index f6a150f..987bb7a 100644
Binary files a/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so and b/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so differ
diff --git a/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so b/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so
index 1b59091..2a031e8 100644
Binary files a/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so and b/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so differ
diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk
index e7f08e9..c619cee 100644
--- a/sdm660-common-vendor.mk
+++ b/sdm660-common-vendor.mk
@@ -70,6 +70,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.ant@1.0.so \
+    vendor/xiaomi/sdm660-common/proprietary/system_ext/lib/libaptX_encoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libaptX_encoder.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdiag_system.so \
     vendor/xiaomi/sdm660-common/proprietary/product/lib/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.data.factory@2.1.so \
     vendor/xiaomi/sdm660-common/proprietary/product/lib/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.data.slm@1.0.so \
@@ -78,8 +79,8 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/product/lib/vendor.qti.hardware.sensorscalibrate@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.hardware.sensorscalibrate@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/product/lib/vendor.qti.hardware.sigma_miracast@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.hardware.sigma_miracast@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.ant@1.0.so \
-    vendor/xiaomi/sdm660-common/proprietary/product/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptXHD_encoder.so \
-    vendor/xiaomi/sdm660-common/proprietary/product/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptX_encoder.so \
+    vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libaptXHD_encoder.so \
+    vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libaptX_encoder.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
     vendor/xiaomi/sdm660-common/proprietary/product/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.factory@2.1.so \
     vendor/xiaomi/sdm660-common/proprietary/product/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.slm@1.0.so \