diff --git a/Android.bp b/Android.bp
index 921057e..997b266 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,30 +100,6 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "HotwordEnrollmentOKGoogleHEXAGON",
-	owner: "oneplus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
-android_app_import {
-	name: "HotwordEnrollmentXGoogleHEXAGON",
-	owner: "oneplus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
 android_app_import {
 	name: "ImsRcsService",
 	owner: "oneplus",
@@ -211,13 +187,6 @@ dex_import {
 	jars: ["proprietary/system/framework/WfdCommon.jar"],
 }
 
-dex_import {
-	name: "com.android.hotwordenrollment.common.util",
-	owner: "oneplus",
-	jars: ["proprietary/product/framework/com.android.hotwordenrollment.common.util.jar"],
-	product_specific: true,
-}
-
 dex_import {
 	name: "com.qti.dpmframework",
 	owner: "oneplus",
@@ -280,24 +249,6 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
-prebuilt_etc_xml {
-	name: "manifest_oplus_cameramdm",
-	owner: "oneplus",
-	src: "proprietary/vendor/etc/vintf/manifest/manifest_oplus_cameramdm.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
-}
-
-prebuilt_etc_xml {
-	name: "manifest_oplus_vpp",
-	owner: "oneplus",
-	src: "proprietary/vendor/etc/vintf/manifest/manifest_oplus_vpp.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
-}
-
 prebuilt_etc_xml {
 	name: "vendor.qti.gnss@4.0-service",
 	owner: "oneplus",
@@ -307,6 +258,46 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
+android_app_import {
+	name: "HotwordEnrollmentOKGoogleHEXAGON",
+	owner: "oneplus",
+	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "HotwordEnrollmentXGoogleHEXAGON",
+	owner: "oneplus",
+	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+dex_import {
+	name: "com.android.hotwordenrollment.common.util",
+	owner: "oneplus",
+	jars: ["proprietary/product/framework/com.android.hotwordenrollment.common.util.jar"],
+	product_specific: true,
+}
+
+prebuilt_etc_xml {
+	name: "manifest_oplus_cameramdm",
+	owner: "oneplus",
+	src: "proprietary/vendor/etc/vintf/manifest/manifest_oplus_cameramdm.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "manifest_android.hardware.drm@1.3-service.widevine",
 	owner: "oneplus",
diff --git a/avicii-vendor.mk b/avicii-vendor.mk
index cd013b0..eafbb6e 100644
--- a/avicii-vendor.mk
+++ b/avicii-vendor.mk
@@ -5,6 +5,708 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/oneplus/avicii
 
+PRODUCT_COPY_FILES += \
+    vendor/oneplus/avicii/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    vendor/oneplus/avicii/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
+    vendor/oneplus/avicii/proprietary/system_ext/bin/tcmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/tcmd \
+    vendor/oneplus/avicii/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/init/tcmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/tcmd.rc \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/seccomp_policy/tcmd.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/tcmd.policy \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpdecoder.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpencoder.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdavenhancements.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdclient.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdcommonutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdconfigutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfddisplayconfig.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmminterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsink.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmmsrc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsrc_system.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdrtsp.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdservice.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdsinksm.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsink.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsinkinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.diaghal@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdclient.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdcommonutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdconfigutils.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfddisplayconfig.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmminterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmmsink.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdnative.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdrtsp.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdsinksm.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsink.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsinkinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrc.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrcinterface.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.dpmservice@1.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
+    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
+    vendor/oneplus/avicii/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/cdsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/cdsprpcd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.1-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qseecom@1.0-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.soter@1.0-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/init.mdm.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.mdm.sh \
+    vendor/oneplus/avicii/proprietary/vendor/bin/init.qti.chg_policy.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.chg_policy.sh \
+    vendor/oneplus/avicii/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
+    vendor/oneplus/avicii/proprietary/vendor/bin/ks:$(TARGET_COPY_OUT_VENDOR)/bin/ks \
+    vendor/oneplus/avicii/proprietary/vendor/bin/loc_launcher:$(TARGET_COPY_OUT_VENDOR)/bin/loc_launcher \
+    vendor/oneplus/avicii/proprietary/vendor/bin/lowi-server:$(TARGET_COPY_OUT_VENDOR)/bin/lowi-server \
+    vendor/oneplus/avicii/proprietary/vendor/bin/mlid:$(TARGET_COPY_OUT_VENDOR)/bin/mlid \
+    vendor/oneplus/avicii/proprietary/vendor/bin/msm_irqbalance:$(TARGET_COPY_OUT_VENDOR)/bin/msm_irqbalance \
+    vendor/oneplus/avicii/proprietary/vendor/bin/mutualex:$(TARGET_COPY_OUT_VENDOR)/bin/mutualex \
+    vendor/oneplus/avicii/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/pd-mapper:$(TARGET_COPY_OUT_VENDOR)/bin/pd-mapper \
+    vendor/oneplus/avicii/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
+    vendor/oneplus/avicii/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
+    vendor/oneplus/avicii/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
+    vendor/oneplus/avicii/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
+    vendor/oneplus/avicii/proprietary/vendor/bin/qmipriod:$(TARGET_COPY_OUT_VENDOR)/bin/qmipriod \
+    vendor/oneplus/avicii/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \
+    vendor/oneplus/avicii/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/qti:$(TARGET_COPY_OUT_VENDOR)/bin/qti \
+    vendor/oneplus/avicii/proprietary/vendor/bin/rmt_storage:$(TARGET_COPY_OUT_VENDOR)/bin/rmt_storage \
+    vendor/oneplus/avicii/proprietary/vendor/bin/shsusrd:$(TARGET_COPY_OUT_VENDOR)/bin/shsusrd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/slim_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/slim_daemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/ssgqmigd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgqmigd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/ssgtzd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgtzd \
+    vendor/oneplus/avicii/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
+    vendor/oneplus/avicii/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
+    vendor/oneplus/avicii/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/vppservice:$(TARGET_COPY_OUT_VENDOR)/bin/vppservice \
+    vendor/oneplus/avicii/proprietary/vendor/bin/wfdhdcphalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wfdhdcphalservice \
+    vendor/oneplus/avicii/proprietary/vendor/bin/wfdvndservice:$(TARGET_COPY_OUT_VENDOR)/bin/wfdvndservice \
+    vendor/oneplus/avicii/proprietary/vendor/bin/wifidisplayhalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wifidisplayhalservice \
+    vendor/oneplus/avicii/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
+    vendor/oneplus/avicii/proprietary/vendor/bin/xtwifi-client:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-client \
+    vendor/oneplus/avicii/proprietary/vendor/bin/xtwifi-inet-agent:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-inet-agent \
+    vendor/oneplus/avicii/proprietary/vendor/etc/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem \
+    vendor/oneplus/avicii/proprietary/vendor/etc/charger_fstab.qti:$(TARGET_COPY_OUT_VENDOR)/etc/charger_fstab.qti \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/mwqem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/mwqem.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/profileMwqem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/profileMwqem.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile1.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile2.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile3.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile4.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile5.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile6.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile1.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile15.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile16.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile16.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile17.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile17.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile18.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile19.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile19.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile2.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile20.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile21.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile21.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile3.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile32.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile32.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile4.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile5.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile6.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile7.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile7.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile1.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile2.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile3.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile4.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile5.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile6.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/configstore/vpp.configstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/configstore/vpp.configstore.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/data/dsi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/dsi_config.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/com.qualcomm.qti.cne.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/mutualex.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mutualex.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/qmipriod.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/shsusrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/shsusrd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.soter@1.0-service.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \
+    vendor/oneplus/avicii/proprietary/vendor/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \
+    vendor/oneplus/avicii/proprietary/vendor/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/atfwd@2.0.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qti-systemd.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdhdcphalservice.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdvndservice.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wifidisplayhalservice.policy \
+    vendor/oneplus/avicii/proprietary/vendor/etc/ssg/ta_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/ta_config.json \
+    vendor/oneplus/avicii/proprietary/vendor/etc/ssg/tz_whitelist.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/tz_whitelist.json \
+    vendor/oneplus/avicii/proprietary/vendor/etc/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/wfdconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wfdconfig.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \
+    vendor/oneplus/avicii/proprietary/vendor/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf \
+    vendor/oneplus/avicii/proprietary/vendor/lib/btaudio_offload_if.so:$(TARGET_COPY_OUT_VENDOR)/lib/btaudio_offload_if.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libEGL_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv1_CM_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv2_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libApeSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libC2D2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCB.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libFileMux_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFileMux_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeg4SwEncoder.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeghSwEnc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAacDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrwbplusDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxEvrcDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxG711Dec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxMpeghDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghDecSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxMpeghEncSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghEncSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxQcelp13Dec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxSwVdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxSwVencMpeg4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVencMpeg4.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxVideoDSMode.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxVideoDSMode.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxVpp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxVpp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCL.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib/libVkLayer_q3dtools.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libadreno_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadreno_utils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libbluetooth_audio_session_qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbluetooth_audio_session_qti.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbluetooth_audio_session_qti_2_1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc2d30_bltlib.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsp_default_listener.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdiag.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libdsd2pcm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsd2pcm.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libdsi_netctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsi_netctrl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libfastcrc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcrc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libfastcvdsp_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcvdsp_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgpudataproducer.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgsl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libidl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-glnext.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-qcom.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-hdcpmgr.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmrtpdecoder_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libmmrtpencoder_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmrtpencoder_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfioctl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcmaputils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_cci.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_helper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_qmux.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_common_so.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_legacy.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveCommon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveCommon.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveCommon_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveCommon_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectSegmentation.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectSegmentation.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectSegmentation_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectSegmentation_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectTracker.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libswvdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsysmon_cdsp_skel.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libvppclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvppclient.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libvpphcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphcp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphvx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcodecv4l2_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdcommonutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcommonutils_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdconfigutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdconfigutils_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfddisplayconfig_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpcp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpservice_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmminterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmminterface_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmmservice_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmmsrc_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmsrc_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmodulehdcpsession.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmodulehdcpsession.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdrtsp_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdrtsp_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsessionmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsessionmodule.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsourcesession_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsourcesession_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsourcesm_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsourcesm_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcinterface_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsink_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsink_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsinkinterface_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsrc_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrc_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrcinterface_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdutils_proprietary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.bluetooth_sar@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.bluetooth_sar@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/btaudio_offload_if.so:$(TARGET_COPY_OUT_VENDOR)/lib64/btaudio_offload_if.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/deviceInfoServiceModule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/deviceInfoServiceModule.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/eglSubDriverAndroid.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libEGL_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv1_CM_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv2_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gnss@2.1-impl-qti.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.dsi.ant@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@4.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imscmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imscmservice.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsdpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsdpl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsqimf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsqimf.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsrcs-v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcs-v2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcsbaseimpl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsvtcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsvtcore.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsxml.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rcsconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rcsconfig.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpcommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcommon.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcore.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpsl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-siputility.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-siputility.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-uceservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-uceservice.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAlacSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libApeSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libC2D2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCB.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libFlacSwDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPQTEEC_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPQTEEC_vendor.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPTEE_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPTEE_vendor.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeg4SwEncoder.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeghSwEnc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAacDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDecSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrwbplusDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDecSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxEvrcDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxG711Dec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxMpeghEncSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxMpeghEncSw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxQcelp13Dec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxSwVdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxSwVdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxSwVencMpeg4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxSwVencMpeg4.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxVpp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxVpp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxWmaDec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOpenCL.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQSEEComAPI.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libQTEEConnector_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQTEEConnector_vendor.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libSecureUILib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSecureUILib.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libStDrvInt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libStDrvInt.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVkLayer_q3dtools.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libadreno_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadreno_utils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libadsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadsp_default_listener.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libaoa.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaoa.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1cper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1cper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1crt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1crt.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1crtx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1crtx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libbatching.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbatching.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti_2_1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libbtnv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbtnv.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc2d30_bltlib.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcacertclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcacertclient.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdfw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdfw_remote_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw_remote_api.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsp_default_listener.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcne.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcne.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneapiclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneapiclient.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneoplookup.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneoplookup.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneqmiutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneqmiutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libconfigdb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libconfigdb.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcpion.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdataitems.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdataitems.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdiag.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdpmqmihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdpmqmihal.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmfs.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdrmtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmtime.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdsi_netctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdsi_netctrl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdsutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libfastcvdsp_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfastcvdsp_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgdtap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgdtap.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgeofencing.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgeofencing.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgnss.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnss.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgnsspps.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnsspps.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgps.utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgps.utils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgpudataproducer.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgsl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libhexagon_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhexagon_nn_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libhta_hexagon_runtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhta_hexagon_runtime.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libidl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libizat_client_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_client_api.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libizat_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_core.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libjnihelper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjnihelper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterdeviceutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterprovision.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterprovision.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblbs_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblbs_core.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblearningmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblearningmodule.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-glnext.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-qcom.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_api_v02.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_api_v02.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_core.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_socket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_socket.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocation_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocation_api.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocationservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocationservice_glue.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice_glue.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblowi_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_client.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblowi_wifihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_wifihal.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/liblqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblqe.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmdetect.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libmeters.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmeters.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminkdescriptor.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_nr_fusion.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_rmnet_ext.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libnlnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnlnetmgr.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libops.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libops.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfconfig.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfioctl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcbor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcbor.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcc_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcc_file_agent.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcrildatactl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrildatactl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_cci.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_client_helper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_client_qmux.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_common_so.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_csi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_encdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_legacy.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmiservices.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqrtr.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtikeymaster4.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/librcc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librcc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-hal-qmi.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-logger.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-logger.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-ltedirectdisc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-radioconfig.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qcril-hook-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qcril-hook-oem.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librilqmiservices.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveCommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveCommon.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveCommon_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveCommon_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectSegmentation.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectSegmentation.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectSegmentation_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectTracker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectTracker.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectTracker_stub.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdsprpc.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsecureui.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsettings.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsettings.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libslimclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libslimclient.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsoc_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsoc_helper.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswvdec.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsysmon_cdsp_skel.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsystem_health_mon.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libtime_genoff.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtime_genoff.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpphcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphcp.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphvx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpplibrary.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/libxtadapter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtadapter.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qcrild_librilutils.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/qtibus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtibus.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/qtimutex.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtimutex.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-adreno.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-common.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hta.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hta.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hvx.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.mwqem@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.slm@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@3.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0-service.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cacert@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.latency@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.lce@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.dsp@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.am@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.4.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.5.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.6.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.7.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.slmadapter@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.soter@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.2.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.3.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callcapability@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callinfo@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.latency@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.1.so \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/2_version_add_wps_config.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/3_version_update_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_update_wps_config.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/4_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_update_ecc_table.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/5_version_update_ecc_table.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/6_version_update_ecc_table.sql \
+    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
+
+PRODUCT_PACKAGES += \
+    libfastcvopt \
+    libthermalclient \
+    CACertService \
+    CneApp \
+    IWlanService \
+    TimeService \
+    PowerOffAlarm \
+    ImsRcsService \
+    QtiTelephony \
+    QtiTelephonyService \
+    WfdService \
+    dpmserviceapp \
+    ims \
+    qcrilmsgtunnel \
+    WfdCommon \
+    com.qti.dpmframework \
+    dpmapi \
+    qcrilhook \
+    vendor.qti.hardware.alarm-V1.0-java \
+    vendor.qti.ims.factory-V2.0-java \
+    android.hardware.gnss@2.1-service-qti \
+    android.hardware.neuralnetworks@1.3-service-qti-hta \
+    android.hardware.neuralnetworks@1.3-service-qti \
+    vendor.qti.gnss@4.0-service
 PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/com.android.hotwordenrollment.common.util.xml \
     vendor/oneplus/avicii/proprietary/odm/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_ODM)/bin/hw/android.hardware.drm@1.3-service.widevine \
@@ -25,12 +727,10 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_ODM)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
     vendor/oneplus/avicii/proprietary/odm/etc/init/vendor.oplus.hardware.biometrics.fingerprint@2.1-service.rc:$(TARGET_COPY_OUT_ODM)/etc/init/vendor.oplus.hardware.biometrics.fingerprint@2.1-service.rc \
     vendor/oneplus/avicii/proprietary/odm/etc/init/vendor.oplus.hardware.oplusSensor@1.0-service.rc:$(TARGET_COPY_OUT_ODM)/etc/init/vendor.oplus.hardware.oplusSensor@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/odm/etc/izat.conf:$(TARGET_COPY_OUT_ODM)/etc/izat.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
     vendor/oneplus/avicii/proprietary/odm/etc/samsung1024_ams644vk04_eyeprotect_data.xml:$(TARGET_COPY_OUT_ODM)/etc/samsung1024_ams644vk04_eyeprotect_data.xml \
     vendor/oneplus/avicii/proprietary/odm/etc/samsung1024_ams644vk04_srgb_eyeprotect_data.xml:$(TARGET_COPY_OUT_ODM)/etc/samsung1024_ams644vk04_srgb_eyeprotect_data.xml \
-    vendor/oneplus/avicii/proprietary/odm/etc/sap.conf:$(TARGET_COPY_OUT_ODM)/etc/sap.conf \
     vendor/oneplus/avicii/proprietary/odm/etc/sensor/sensor_config.json:$(TARGET_COPY_OUT_ODM)/etc/sensor/sensor_config.json \
     vendor/oneplus/avicii/proprietary/odm/etc/wifi/bdwlan.bin:$(TARGET_COPY_OUT_ODM)/etc/wifi/bdwlan.bin \
     vendor/oneplus/avicii/proprietary/odm/etc/wifi/bdwlanu.bin:$(TARGET_COPY_OUT_ODM)/etc/wifi/bdwlanu.bin \
@@ -204,30 +904,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/firmware/awinic.haptic.effect.so:$(TARGET_COPY_OUT_ODM)/firmware/awinic.haptic.effect.so \
     vendor/oneplus/avicii/proprietary/odm/firmware/awinic_haptic_gun_params.bin:$(TARGET_COPY_OUT_ODM)/firmware/awinic_haptic_gun_params.bin \
     vendor/oneplus/avicii/proprietary/odm/firmware/awinic_haptic_params.bin:$(TARGET_COPY_OUT_ODM)/firmware/awinic_haptic_params.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/132700/oplus_vooc_fw_rt5125.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/132700/oplus_vooc_fw_rt5125.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19015/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19015/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19016/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19016/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19101/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19101/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19102/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19102/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19125/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19125/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19126/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19126/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19127/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19127/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19128/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19128/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19191/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19191/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19192/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19192/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19335/oppo_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19335/oppo_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19501/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19501/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19517/oppo_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19517/oppo_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19521/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19521/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19525/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19525/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/19591/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/19591/oplus_vooc_fw.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20057/oplus_vooc_fw_rt5125.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20057/oplus_vooc_fw_rt5125.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20058/oplus_vooc_fw_rt5125.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20058/oplus_vooc_fw_rt5125.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20111/oplus_vooc_fw_op10.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20111/oplus_vooc_fw_op10.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20113/oplus_vooc_fw_op10.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20113/oplus_vooc_fw_op10.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20127/oplus_vooc_fw_op10.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20127/oplus_vooc_fw_op10.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20251/oplus_vooc_fw_op10.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20251/oplus_vooc_fw_op10.bin \
-    vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20669/oplus_vooc_fw_rt5125.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20669/oplus_vooc_fw_rt5125.bin \
     vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20801/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20801/oplus_vooc_fw.bin \
     vendor/oneplus/avicii/proprietary/odm/firmware/fastchg/20804/oplus_vooc_fw.bin:$(TARGET_COPY_OUT_ODM)/firmware/fastchg/20804/oplus_vooc_fw.bin \
     vendor/oneplus/avicii/proprietary/odm/firmware/notif_Glint_RTP.bin:$(TARGET_COPY_OUT_ODM)/firmware/notif_Glint_RTP.bin \
@@ -259,7 +935,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/lib/rfsa/adsp/libktvpitchshift.so:$(TARGET_COPY_OUT_ODM)/lib/rfsa/adsp/libktvpitchshift.so \
     vendor/oneplus/avicii/proprietary/odm/lib/rfsa/adsp/libktvreverb.so:$(TARGET_COPY_OUT_ODM)/lib/rfsa/adsp/libktvreverb.so \
     vendor/oneplus/avicii/proprietary/odm/lib/rfsa/adsp/libktvvolume.so:$(TARGET_COPY_OUT_ODM)/lib/rfsa/adsp/libktvvolume.so \
-    vendor/oneplus/avicii/proprietary/odm/lib/vendor.oplus.hardware.orms@1.0.so:$(TARGET_COPY_OUT_ODM)/lib/vendor.oplus.hardware.orms@1.0.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/camera/components/com.qti.node.remosaic.so:$(TARGET_COPY_OUT_ODM)/lib64/camera/components/com.qti.node.remosaic.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/hw/fingerprint.18821_goodix9508_G2_4.default.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/fingerprint.18821_goodix9508_G2_4.default.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/hw/fingerprint.18857_goodix9508_G2_4.default.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/fingerprint.18857_goodix9508_G2_4.default.so \
@@ -290,13 +965,10 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/lib64/libwvhidl.so:$(TARGET_COPY_OUT_ODM)/lib64/libwvhidl.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/mediadrm/libwvdrmengine.so:$(TARGET_COPY_OUT_ODM)/lib64/mediadrm/libwvdrmengine.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/sensors.hal.tof.so:$(TARGET_COPY_OUT_ODM)/lib64/sensors.hal.tof.so \
-    vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.appradio@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.appradio@1.0.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.commondcs@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.commondcs@1.0.so \
-    vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.ims@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.ims@1.0.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.oplusSensor@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.oplusSensor@1.0.so \
     vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.orms@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.orms@1.0.so \
-    vendor/oneplus/avicii/proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.radio@1.0.so \
-    vendor/oneplus/avicii/proprietary/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_ODM)/vendor/etc/wifi/WCNSS_qcom_cfg.ini \
+    vendor/oneplus/avicii/proprietary/vendor/etc/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b00:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b00 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b01:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b01 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b02:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b02 \
@@ -306,167 +978,21 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b06:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b06 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b07:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b07 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.mdt:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.mdt \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b00:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b00 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b01:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b01 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b02:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b02 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b03:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b03 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b04:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b04 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b05:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b05 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b06:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b06 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.b07:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.b07 \
-    vendor/oneplus/avicii/proprietary/odm/vendor/firmware/widevine.mdt:$(TARGET_COPY_OUT_ODM)/vendor/firmware/widevine.mdt \
-    vendor/oneplus/avicii/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
-    vendor/oneplus/avicii/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
-    vendor/oneplus/avicii/proprietary/system_ext/bin/tcmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/tcmd \
-    vendor/oneplus/avicii/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/init/tcmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/tcmd.rc \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/seccomp_policy/tcmd.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/tcmd.policy \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpdecoder.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpencoder.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdavenhancements.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdclient.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdcommonutils.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdconfigutils.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfddisplayconfig.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmminterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsink.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdmmsrc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsrc_system.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdrtsp.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdservice.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdsinksm.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsink.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsinkinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.diaghal@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \
     vendor/oneplus/avicii/proprietary/system_ext/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libaptXHD_encoder.so \
     vendor/oneplus/avicii/proprietary/system_ext/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libaptX_encoder.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdclient.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdcommonutils.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdconfigutils.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfddisplayconfig.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmminterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmmsink.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdnative.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdrtsp.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdsinksm.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsink.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsinkinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrc.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrcinterface.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.dpmservice@1.0.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
-    vendor/oneplus/avicii/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/cdsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/cdsprpcd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
     vendor/oneplus/avicii/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \
     vendor/oneplus/avicii/proprietary/vendor/bin/feature_enabler_client:$(TARGET_COPY_OUT_VENDOR)/bin/feature_enabler_client \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
     vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.oplus.hardware.cameraMDM@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.oplus.hardware.cameraMDM@1.0-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service \
     vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.display.composer-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.display.composer-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qseecom@1.0-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service \
     vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.soter@1.0-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/init.mdm.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.mdm.sh \
     vendor/oneplus/avicii/proprietary/vendor/bin/init.qcom.sensors.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.sensors.sh \
-    vendor/oneplus/avicii/proprietary/vendor/bin/init.qti.chg_policy.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.chg_policy.sh \
-    vendor/oneplus/avicii/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
-    vendor/oneplus/avicii/proprietary/vendor/bin/ks:$(TARGET_COPY_OUT_VENDOR)/bin/ks \
-    vendor/oneplus/avicii/proprietary/vendor/bin/loc_launcher:$(TARGET_COPY_OUT_VENDOR)/bin/loc_launcher \
-    vendor/oneplus/avicii/proprietary/vendor/bin/lowi-server:$(TARGET_COPY_OUT_VENDOR)/bin/lowi-server \
-    vendor/oneplus/avicii/proprietary/vendor/bin/mlid:$(TARGET_COPY_OUT_VENDOR)/bin/mlid \
-    vendor/oneplus/avicii/proprietary/vendor/bin/msm_irqbalance:$(TARGET_COPY_OUT_VENDOR)/bin/msm_irqbalance \
-    vendor/oneplus/avicii/proprietary/vendor/bin/mutualex:$(TARGET_COPY_OUT_VENDOR)/bin/mutualex \
-    vendor/oneplus/avicii/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/pd-mapper:$(TARGET_COPY_OUT_VENDOR)/bin/pd-mapper \
-    vendor/oneplus/avicii/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
-    vendor/oneplus/avicii/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
-    vendor/oneplus/avicii/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
-    vendor/oneplus/avicii/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
     vendor/oneplus/avicii/proprietary/vendor/bin/ppd:$(TARGET_COPY_OUT_VENDOR)/bin/ppd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/qmipriod:$(TARGET_COPY_OUT_VENDOR)/bin/qmipriod \
-    vendor/oneplus/avicii/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \
-    vendor/oneplus/avicii/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/qti:$(TARGET_COPY_OUT_VENDOR)/bin/qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/rmt_storage:$(TARGET_COPY_OUT_VENDOR)/bin/rmt_storage \
     vendor/oneplus/avicii/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/shsusrd:$(TARGET_COPY_OUT_VENDOR)/bin/shsusrd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/slim_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/slim_daemon \
     vendor/oneplus/avicii/proprietary/vendor/bin/sscrpcd:$(TARGET_COPY_OUT_VENDOR)/bin/sscrpcd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/ssgqmigd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgqmigd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/ssgtzd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgtzd \
-    vendor/oneplus/avicii/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
-    vendor/oneplus/avicii/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
-    vendor/oneplus/avicii/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/vppservice:$(TARGET_COPY_OUT_VENDOR)/bin/vppservice \
-    vendor/oneplus/avicii/proprietary/vendor/bin/wfdhdcphalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wfdhdcphalservice \
-    vendor/oneplus/avicii/proprietary/vendor/bin/wfdvndservice:$(TARGET_COPY_OUT_VENDOR)/bin/wfdvndservice \
-    vendor/oneplus/avicii/proprietary/vendor/bin/wifidisplayhalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wifidisplayhalservice \
-    vendor/oneplus/avicii/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/xtwifi-client:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-client \
-    vendor/oneplus/avicii/proprietary/vendor/bin/xtwifi-inet-agent:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-inet-agent \
-    vendor/oneplus/avicii/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/ArmHDCP_QTI_Android.cfg \
     vendor/oneplus/avicii/proprietary/vendor/etc/Oppo_QC_LTM_Commercial_2020_01_03.pfm:$(TARGET_COPY_OUT_VENDOR)/etc/Oppo_QC_LTM_Commercial_2020_01_03.pfm \
     vendor/oneplus/avicii/proprietary/vendor/etc/Oppo_QC_LTM_Commercial_SM7225_2021_01_08.pfm:$(TARGET_COPY_OUT_VENDOR)/etc/Oppo_QC_LTM_Commercial_SM7225_2021_01_08.pfm \
     vendor/oneplus/avicii/proprietary/vendor/etc/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb \
-    vendor/oneplus/avicii/proprietary/vendor/etc/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/M_Attribute_AG_BMW_1.1.0.model.hardcode:$(TARGET_COPY_OUT_VENDOR)/etc/camera/M_Attribute_AG_BMW_1.1.0.model.hardcode \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/ashdr/ncf_pack.ncf:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ashdr/ncf_pack.ncf \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/ashdr/ncf_pack_imx471.ncf:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ashdr/ncf_pack_imx471.ncf \
@@ -478,120 +1004,18 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/darksight/darksight_ultrawide.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/darksight/darksight_ultrawide.bin \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/distortion_result.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/distortion_result.bin \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/distortion_result_front.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/distortion_result_front.bin \
-    vendor/oneplus/avicii/proprietary/vendor/etc/charger_fstab.qti:$(TARGET_COPY_OUT_VENDOR)/etc/charger_fstab.qti \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/mwqem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/mwqem.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/profileMwqem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/profileMwqem.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile1.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile2.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile3.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile4.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile5.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile6.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile1.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile15.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile16.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile16.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile17.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile17.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile18.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile19.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile19.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile2.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile20.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile21.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile21.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile3.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile32.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile32.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile4.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile5.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile6.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/ROW/ROW_profile7.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ROW/ROW_profile7.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile1.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile2.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile3.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile4.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile5.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/VZW/VZW_profile6.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/configstore/vpp.configstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/configstore/vpp.configstore.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/data/dsi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/dsi_config.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/com.qualcomm.qti.cne.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/feature_enabler_client.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/feature_enabler_client.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/init.vendor.sensors.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.sensors.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/ipa_fws.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ipa_fws.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/mutualex.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mutualex.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/qmipriod.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/shsusrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/shsusrd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.display.color@1.0-service.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.oplus.hardware.cameraMDM@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.oplus.hardware.cameraMDM@1.0-service.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.adsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.sensorscalibrate@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.sensorscalibrate@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.soter@1.0-service.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.sensors.qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.qti.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.sensors.sscrpcd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.sscrpcd.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/ltm_config_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ltm_config_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \
     vendor/oneplus/avicii/proprietary/vendor/etc/qdcm_calib_data_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/atfwd@2.0.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qti-systemd.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdhdcphalservice.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdvndservice.policy \
-    vendor/oneplus/avicii/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wifidisplayhalservice.policy \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/alsps.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/alsps.json \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/bmi160.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmi160.json \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/bmi260_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmi260_0.json \
@@ -666,15 +1090,8 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/tcs3408.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/tcs3408.json \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/tcs3701.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/tcs3701.json \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/sns_reg_config:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sns_reg_config \
-    vendor/oneplus/avicii/proprietary/vendor/etc/ssg/ta_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/ta_config.json \
-    vendor/oneplus/avicii/proprietary/vendor/etc/ssg/tz_whitelist.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/tz_whitelist.json \
-    vendor/oneplus/avicii/proprietary/vendor/etc/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/wfdconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wfdconfig.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-    vendor/oneplus/avicii/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \
-    vendor/oneplus/avicii/proprietary/vendor/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf \
     vendor/oneplus/avicii/proprietary/vendor/firmware/CAMERA_ICP.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/CAMERA_ICP.elf \
     vendor/oneplus/avicii/proprietary/vendor/firmware/a620_zap.b00:$(TARGET_COPY_OUT_VENDOR)/firmware/a620_zap.b00 \
     vendor/oneplus/avicii/proprietary/vendor/firmware/a620_zap.b01:$(TARGET_COPY_OUT_VENDOR)/firmware/a620_zap.b01 \
@@ -690,152 +1107,30 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/firmware/ipa_fws.b04:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_fws.b04 \
     vendor/oneplus/avicii/proprietary/vendor/firmware/ipa_fws.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_fws.elf \
     vendor/oneplus/avicii/proprietary/vendor/firmware/ipa_fws.mdt:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_fws.mdt \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.b00:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.b00 \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.b01:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.b01 \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.b02:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.b02 \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.b03:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.b03 \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.b04:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.b04 \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.elf \
-    vendor/oneplus/avicii/proprietary/vendor/firmware/lagoon_ipa_fws.mdt:$(TARGET_COPY_OUT_VENDOR)/firmware/lagoon_ipa_fws.mdt \
-    vendor/oneplus/avicii/proprietary/vendor/lib/btaudio_offload_if.so:$(TARGET_COPY_OUT_VENDOR)/lib/btaudio_offload_if.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libEGL_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv1_CM_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv2_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/hw/audio.primary.lito.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/audio.primary.lito.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/hw/sound_trigger.primary.lito.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sound_trigger.primary.lito.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libApeSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libC2D2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCB.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libFileMux_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFileMux_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeg4SwEncoder.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeghSwEnc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAacDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrwbplusDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxEvrcDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxG711Dec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxMpeghDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghDecSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxMpeghEncSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghEncSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxQcelp13Dec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxSwVdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxSwVencMpeg4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVencMpeg4.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxVideoDSMode.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxVideoDSMode.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxVpp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxVpp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCL.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib/libVkLayer_q3dtools.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/liba2dpoffload.so:$(TARGET_COPY_OUT_VENDOR)/lib/liba2dpoffload.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libacdb-fts.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdb-fts.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libacdbloader.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbloader.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libacdbrtac.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbrtac.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libadiertac.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadiertac.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libadm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadm.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libadreno_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadreno_utils.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadsprpc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libaudcal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudcal.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libaudio_log_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudio_log_utils.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libaudioparsers.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudioparsers.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libbluetooth_audio_session_qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbluetooth_audio_session_qti.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbluetooth_audio_session_qti_2_1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libc++_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc++_shared.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc2d30_bltlib.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libcapiv2svacnn.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcapiv2svacnn.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libcapiv2vop.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcapiv2vop.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsp_default_listener.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdiag.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libdsd2pcm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsd2pcm.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libdsi_netctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsi_netctrl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libfastcrc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcrc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libfastcvdsp_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcvdsp_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libgcs-calwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-calwrapper.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libgcs-ipc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-ipc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libgcs-osal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-osal.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libgcs.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgpudataproducer.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgsl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libhdmipassthru.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhdmipassthru.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libidl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/liblistensoundmodel2.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblistensoundmodel2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-glnext.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-qcom.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-hdcpmgr.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmrtpdecoder_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libmmrtpencoder_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmrtpencoder_proprietary.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libmulawdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmulawdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfioctl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcmaputils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_cci.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_helper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_qmux.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_common_so.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_legacy.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveCommon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveCommon.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveCommon_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveCommon_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectSegmentation.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectSegmentation.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectSegmentation_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectSegmentation_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectTracker.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdsprpc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/libssrec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libssrec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libswvdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsysmon_cdsp_skel.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libvppclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvppclient.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libvpphcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphcp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphvx.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcodecv4l2_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdcommonutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcommonutils_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdconfigutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdconfigutils_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfddisplayconfig_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpcp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpservice_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmminterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmminterface_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmmservice_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmmsrc_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmsrc_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdmodulehdcpsession.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmodulehdcpsession.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdrtsp_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdrtsp_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsessionmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsessionmodule.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsourcesession_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsourcesession_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdsourcesm_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdsourcesm_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcinterface_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsink_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsink_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsinkinterface_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsrc_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrc_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrcinterface_proprietary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/libwfdutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdutils_proprietary.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/rfsa/adsp/capi_v2_dap_cpdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_dap_cpdp.so \
@@ -872,15 +1167,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcvirt.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/soundfx/libshoebox.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libshoebox.so \
     vendor/oneplus/avicii/proprietary/vendor/lib/vendor.oplus.hardware.performance@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.oplus.hardware.performance@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.bluetooth_sar@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.bluetooth_sar@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/btaudio_offload_if.so:$(TARGET_COPY_OUT_VENDOR)/lib64/btaudio_offload_if.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/camera/com.qti.eeprom.truly_cmb433.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.truly_cmb433.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/camera/com.qti.sensor.gc2375.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.gc2375.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/camera/com.qti.sensor.gc5035.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.gc5035.so \
@@ -966,91 +1252,11 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/com.qti.feature2.serializer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.serializer.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/com.qti.feature2.stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/com.qti.feature2.swmf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.swmf.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/deviceInfoServiceModule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/deviceInfoServiceModule.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/eglSubDriverAndroid.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libEGL_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv1_CM_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv2_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gnss@2.1-impl-qti.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/camera.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.qcom.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.dsi.ant@1.0-impl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qti.chi.override.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@4.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imscmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imscmservice.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsdpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsdpl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsqimf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsqimf.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsrcs-v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcs-v2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcsbaseimpl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsvtcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsvtcore.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-imsxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsxml.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rcsconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rcsconfig.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpcommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcommon.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcore.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-rtpsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpsl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-siputility.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-siputility.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib-uceservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-uceservice.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAlacSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libApeSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libC2D2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCB.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libFlacSwDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPQTEEC_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPQTEEC_vendor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPTEE_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPTEE_vendor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeg4SwEncoder.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeghSwEnc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAacDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDecSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrwbplusDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDecSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxEvrcDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxG711Dec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxMpeghEncSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxMpeghEncSw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxQcelp13Dec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxSwVdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxSwVdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxSwVencMpeg4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxSwVencMpeg4.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxVpp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxVpp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxWmaDec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOpenCL.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libPolarrRender.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libPolarrRender.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQSEEComAPI.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libQTEEConnector_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQTEEConnector_vendor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSecureUILib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSecureUILib.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libStDrvInt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libStDrvInt.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVkLayer_q3dtools.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libadreno_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadreno_utils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libadsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadsp_default_listener.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libaoa.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaoa.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_beautyshot.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_beautyshot.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_beautyshot_4.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_beautyshot_4.0.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_dualcam_bokeh_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_dualcam_bokeh_api.so \
@@ -1072,16 +1278,7 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_smart_denoise.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_smart_denoise.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_super_night_raw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_super_night_raw.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_superportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_superportrait.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1cper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1cper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1crt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1crt.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libasn1crtx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libasn1crtx.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libbatching.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbatching.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libbitmlengine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbitmlengine.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti_2_1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libbtnv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbtnv.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc2d30_bltlib.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcacertclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcacertclient.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamera2ndk_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera2ndk_vendor.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamera_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_nn_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamerapostproc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamerapostproc.so \
@@ -1095,138 +1292,34 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamxstatscore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxstatscore.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamxswprocessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxswprocessalgo.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamxtintlessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxtintlessalgo.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdfw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdfw_remote_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw_remote_api.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsp_default_listener.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsprpc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libchilog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libchilog.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcne.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcne.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneapiclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneapiclient.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneoplookup.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneoplookup.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcneqmiutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneqmiutils.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcom.qti.chinodeutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcom.qti.chinodeutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libconfigdb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libconfigdb.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcpion.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcvface_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvface_api.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcvp_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvp_common.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcvpcpuRev_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvpcpuRev_skel.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdataitems.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdataitems.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdiag.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdisp-aba.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdisp-aba.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdisplayconfig.qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdisplayconfig.qti.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdisplayqos.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdisplayqos.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdisplayskuutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdisplayskuutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdpmqmihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdpmqmihal.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmfs.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdrmtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmtime.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdsi_netctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdsi_netctrl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdsutils.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcam_image_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_image_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_optical_zoom_control.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_video_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcamirfusion.arcsoft.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcamirfusion.arcsoft.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libfastcvdsp_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfastcvdsp_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgdtap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgdtap.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgeofencing.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgeofencing.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgnss.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnss.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgnsspps.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnsspps.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgps.utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgps.utils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgpudataproducer.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgsl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libhdr_tm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdr_tm.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libhexagon_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhexagon_nn_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libhistogram.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhistogram.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libhta_hexagon_runtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhta_hexagon_runtime.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libidl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libipebpsstriping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libipebpsstriping.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libizat_client_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_client_api.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libizat_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_core.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libjnihelper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjnihelper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterdeviceutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterprovision.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterprovision.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblbs_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblbs_core.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblearningmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblearningmodule.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-glnext.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-qcom.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_api_v02.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_api_v02.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_core.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libloc_socket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_socket.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocation_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocation_api.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocationservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblocationservice_glue.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice_glue.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblowi_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_client.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblowi_wifihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_wifihal.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liblqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblqe.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmdetect.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmeters.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmeters.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmidasserviceintf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmidasserviceintf.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminkdescriptor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmmcamera_faceproc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmcamera_faceproc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmmcamera_faceproc2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmcamera_faceproc2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmpbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmpbase.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libnanopb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnanopb.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_nr_fusion.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_rmnet_ext.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libnlnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnlnetmgr.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/liboemnvbk_img_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemnvbk_img_helper.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libofflinelog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libofflinelog.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libops.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libops.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libos.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libos.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfconfig.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfioctl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libpwirisIoctlWrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpwirisIoctlWrapper.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libpwirisfeature.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpwirisfeature.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libpwirishalwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpwirishalwrapper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcbor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcbor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcc_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcc_file_agent.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqcrildatactl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrildatactl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libqdutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_cci.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_client_helper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_client_qmux.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_common_so.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_csi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_encdec.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_legacy.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmiservices.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqrtr.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqseed3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtikeymaster4.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/librcc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librcc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-hal-qmi.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-logger.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-logger.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-ltedirectdisc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-radioconfig.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libril-qcril-hook-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qcril-hook-oem.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librilqmiservices.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveCommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveCommon.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveCommon_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveCommon_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectSegmentation.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectSegmentation.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectSegmentation_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectTracker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectTracker.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveObjectTracker_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdedrm.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdm-color.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdm-colormgr-algo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdm-colormgr-algo.so \
@@ -1235,48 +1328,24 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdmcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdmcore.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdmextension.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdmextension.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdmutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdmutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsecureui.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsensorcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorcal.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsensorslog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorslog.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsettings.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsettings.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libslimclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libslimclient.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_device_mode_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_device_mode_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_fastRPC_util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_fastRPC_util.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_low_lat_stream_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_low_lat_stream_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsnsapi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsapi.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsnsdiaglog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsdiaglog.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsoc_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsoc_helper.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libssc_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc_default_listener.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libswregistrationalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswregistrationalgo.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswvdec.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsynx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsynx.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsysmon_cdsp_skel.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsystem_health_mon.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libthreadutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libthreadutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libtime_genoff.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtime_genoff.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtinyxml2_1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtriplecam_image_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_image_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtriplecam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_optical_zoom_control.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_video_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtrustedapploader.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpphcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphcp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpphvx.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpplibrary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libxtadapter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtadapter.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qcrild_librilutils.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/qtibus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtibus.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/qtimutex.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtimutex.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-common.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hta.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hta.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hvx.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.0.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.2.so \
@@ -1289,125 +1358,14 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.pixelworks.hardware.display@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.pixelworks.hardware.display@1.0.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.pixelworks.hardware.display@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.pixelworks.hardware.display@1.1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.pixelworks.hardware.feature@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.pixelworks.hardware.feature@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.mwqem@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.slm@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@3.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0-service.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cacert@1.0.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.latency@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.lce@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.dsp@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.am@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.4.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.5.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.6.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.slmadapter@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.soter@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.3.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callcapability@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callinfo@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.latency@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/2_version_add_wps_config.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/3_version_update_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_update_wps_config.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/4_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_update_ecc_table.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/5_version_update_ecc_table.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/6_version_update_ecc_table.sql \
-    vendor/oneplus/avicii/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
+    vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so
 
 PRODUCT_PACKAGES += \
-    libfastcvopt \
-    libthermalclient \
-    CACertService \
-    CneApp \
-    IWlanService \
-    TimeService \
-    PowerOffAlarm \
     HotwordEnrollmentOKGoogleHEXAGON \
     HotwordEnrollmentXGoogleHEXAGON \
-    ImsRcsService \
-    QtiTelephony \
-    QtiTelephonyService \
-    WfdService \
-    dpmserviceapp \
-    ims \
-    qcrilmsgtunnel \
-    WfdCommon \
     com.android.hotwordenrollment.common.util \
-    com.qti.dpmframework \
-    dpmapi \
-    qcrilhook \
-    vendor.qti.hardware.alarm-V1.0-java \
-    vendor.qti.ims.factory-V2.0-java \
-    android.hardware.gnss@2.1-service-qti \
-    android.hardware.neuralnetworks@1.3-service-qti-hta \
-    android.hardware.neuralnetworks@1.3-service-qti \
     manifest_oplus_cameramdm \
-    manifest_oplus_vpp \
-    vendor.qti.gnss@4.0-service \
     manifest_android.hardware.drm@1.3-service.widevine \
     manifest_oplusSensor \
     manifest_oplus_fingerprint
diff --git a/proprietary/odm/etc/izat.conf b/proprietary/odm/etc/izat.conf
deleted file mode 100644
index de269c1..0000000
--- a/proprietary/odm/etc/izat.conf
+++ /dev/null
@@ -1,281 +0,0 @@
-#########################################
-# Log verbosity control for izat modules
-#########################################
-# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5
-IZAT_DEBUG_LEVEL = 2
-#ODM
-##################################################
-# Select WIFI Wait Timeout value in seconds for SUPL
-##################################################
-WIFI_WAIT_TIMEOUT_SELECT = 0
-
-##################################################
-# Time interval of injecting SRN scan data to modem
-# time in seconds.
-# Note: recommended value is between 1-5 sec
-##################################################
-LPPE_SRN_DATA_SCAN_INJECT_TIME=2
-
-################################
-# NLP Settings
-################################
-# NLP_MODE  1: OSNLP Only, 2: QNP Only, 3: Combo, 4: QNP preferred
-# For Automotive products, please use NLP_MODE = 4 only.
-# NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode
-# to determine how much Tolerance for first position
-# NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode
-# to determine how much Tolerance for positions after first
-# NLP_THRESHOLD: Sets how many failures needed before
-# switching preferred NLP in Combo mode
-# NLP_ACCURACY_MULTIPLE: Determines how far off the accuracy
-# must be, in multiples, between two NLP location reports to
-# be considered much worse accuracy. Used in switching logic
-# NLP COMBO MODE USES QNP WITH NO EULA CONSENT: Determines
-# whether or not to still send network location requests to
-# QNP when the EULA is not consented to by the user. QNP can
-# still return ZPP locations or injected locations even
-# without EULA consent, but the uncertainty can be high.
-# QNP preferred mode prefers QNP when there is EULA consent,
-# otherwise OSNLP is used.
-NLP_MODE = 1
-NLP_MODE_EMERGENCY = 2
-NLP_TOLERANCE_TIME_FIRST = 5000
-NLP_TOLERANCE_TIME_AFTER = 20000
-NLP_THRESHOLD = 3
-NLP_ACCURACY_MULTIPLE = 2
-NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1
-
-#########################################
-# NLP PACKAGE SETTINGS
-#########################################
-# OSNLP_PACKAGE: name of default NLP package
-OSNLP_PACKAGE = com.google.android.gms
-# REGION_OSNLP_PACKAGE:
-# This value will be used as alternative
-# for particular region where default NLP is not functional.
-#REGION_OSNLP_PACKAGE =
-
-###################################
-# GEOFENCE SERVICES
-###################################
-# If set to one of the defined values below, it will override
-# the responsiveness for geofence services, which implements
-# the Proximity Alert API. If not set to a value defined below,
-# which is default, it will not override the responsivness.
-# The geofence HAL API is unaffected by this value.
-# GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE Values:
-# 1: LOW responsiveness
-# 2: MEDIUM responsiveness
-# 3: HIGH responsiveness
-GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE = 0
-
-#####################################
-#GTP Opt-In app
-#####################################
-
-#GTP privacy policy version url
-#https support is required
-GTP_PRIVACY_VERSION_URL = https://info.izatcloud.net/privacy/version.html
-
-#GTP privacy policy version download retry interval
-#unit is second. default is 86400
-GTP_PRIVACY_RETRY_INTERVAL = 86400
-
-#####################################
-# IZAT PREMIUM FEATURE SETTINGS
-#####################################
-#Possible states of a feature:
-#DISABLED
-#BASIC
-#PREMIUM
-
-#GTP_MODE valid modes:
-# DISABLED
-# LEGACY_WWAN
-# SDK (WWAN not available for Modems before LocTech 10.0)
-GTP_MODE=DISABLED
-
-#GTP_WAA valid modes:
-# DISABLED
-# BASIC
-GTP_WAA=DISABLED
-
-#SAP valid modes:
-# DISABLED
-# BASIC
-# PREMIUM
-# PREMIUM_ENV_AIDING
-# MODEM_DEFAULT
-#ifndef OPLUS_BUG_COMPATIBILITY
-#ShiMinghao@CONNECTIVITY.GPS.SAP.OPCUSTOMIZED, 2020/04/14, Modify for changing SAP mode from MODEM_DEFAULT to PREMIUM
-#SAP=MODEM_DEFAULT
-#else /* OPLUS_BUG_COMPATIBILITY */
-SAP=PREMIUM
-#endif /* OPLUS_BUG_COMPATIBILITY */
-
-#FREE_WIFI_SCAN_INJECT valid modes:
-#DISABLED
-#BASIC
-FREE_WIFI_SCAN_INJECT=BASIC
-
-#SUPL_WIFI valid modes:
-#DISABLED
-#BASIC
-SUPL_WIFI=BASIC
-
-#WIFI_SUPPLICANT_INFO valid modes:
-#DISABLED
-#BASIC
-WIFI_SUPPLICANT_INFO=BASIC
-
-#####################################
-# Location process launcher settings
-#####################################
-
-# DO NOT MODIFY
-# Modifying below attributes without
-# caution can have serious implications.
-
-#Values for PROCESS_STATE:
-# ENABLED
-# DISABLED
-
-#Values for LOW_RAM_TARGETS:
-# ENABLED
-# DISABLED
-# Property to enable/disable processes for low ram targets. Uses ro.config.low_ram property
-# to identify low ram targets.
-
-#PROCESS_NAME
-# Name of the executable file.
-
-#FEATURE MASKS:
-# GTP-WIFI    0X03
-# GTP-MP-CELL 0xc00
-# GTP-WAA     0x100
-# SAP         0Xc0
-# ODCPI      0x1000
-# FREE_WIFI_SCAN_INJECT   0x2000
-# SUPL_WIFI   0x4000
-# WIFI_SUPPLICANT_INFO   0x8000
-
-#Values for PLATFORMS can be:
-#1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226
-#2. 'all' or 'all exclude' -> for All platforms
-#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937
-
-#Values for SOC_IDS can be:
-#1. Any valid values obtained from soc_id node separated by single space. For example: 339 386 436
-##  soc_id value can be obtained from any one of below node:
-##      - /sys/devices/soc0/soc_id
-##      - /sys/devices/system/soc/soc0/id
-#2. 'all' or 'all exclude' -> for All soc id's
-#3. 'all exclude XXXX' -> All soc id's exclude XXXX. For example: all exclude 339 386
-
-#Values for BASEBAND can be:
-#1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
-#2. 'all' or 'all exclude' -> for all basebands
-#3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
-PROCESS_NAME=lowi-server
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps wifi inet oem_2901
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0xf303
-PLATFORMS=all
-SOC_IDS=all
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=0
-
-PROCESS_NAME=xtwifi-inet-agent
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=inet gps
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xc03
-PLATFORMS=all
-SOC_IDS=all exclude 386 436
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=1
-
-PROCESS_NAME=xtwifi-client
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=wifi inet gps system oem_2904
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xd03
-PLATFORMS=all
-SOC_IDS=all exclude 386 436
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=1
-
-PROCESS_NAME=slim_daemon
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0
-PLATFORMS=all
-SOC_IDS=all exclude 386 436
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=1
-
-PROCESS_NAME=xtra-daemon
-PROCESS_ARGUMENT=
-PROCESS_STATE=ENABLED
-PROCESS_GROUPS=inet gps system
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-SOC_IDS=all
-BASEBAND=all
-LOW_RAM_TARGETS=ENABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=0
-
-########################################
-# Engine Service which host DRE module #
-# To enable DRE engine service, change #
-# PROCESS_STATE=ENABLED                #
-########################################
-PROCESS_NAME=engine-service
-PROCESS_ARGUMENT=DRE-INT libloc_epDr.so
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag inet qwes oem_2901 system
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-SOC_IDS=all
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=1
-
-########################################
-# Engine Service which host PPE module #
-# To enable PPE engine service, change #
-# PROCESS_STATE=ENABLED                #
-# and update process arugements        #
-# with PPE library name                #
-#PROCESS_ARGUMENT=PPE libepsimulator.so#
-########################################
-PROCESS_NAME=engine-service
-PROCESS_ARGUMENT=PPE libepsimulator.so
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag inet qwes oem_2901 system
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-SOC_IDS=all
-BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
-HARDWARE_TYPE=all
-VENDOR_ENHANCED_PROCESS=1
diff --git a/proprietary/odm/etc/sap.conf b/proprietary/odm/etc/sap.conf
deleted file mode 100644
index 067259f..0000000
--- a/proprietary/odm/etc/sap.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-################################
-# Sensor Settings
-################################
-#The following parameters are optional.
-#Internal defaults support MEMS sensors
-#native to most handset devices.
-#Device specific sensor characterization
-#for improved performance is possible as
-#described in SAP application notes.
-#GYRO_BIAS_RANDOM_WALK=
-#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY=
-#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY=
-#RATE_RANDOM_WALK_SPECTRAL_DENSITY=
-#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY=
-# Hache out.
-#ODM file
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-#               4 - Debug, 5 - Verbose
-# If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 0
-# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0)
-# used in loc_eng_reinit
-SENSOR_ACCEL_BATCHES_PER_SEC=2
-SENSOR_ACCEL_SAMPLES_PER_BATCH=5
-SENSOR_GYRO_BATCHES_PER_SEC=2
-SENSOR_GYRO_SAMPLES_PER_BATCH=5
-# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0)
-SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4
-SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25
-SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4
-SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
-
-# Sensor Control Mode (0=AUTO, 1=FORCE_ON, 2=MODEM_DEFAULT)
-# used in loc_eng_reinit
-SENSOR_CONTROL_MODE=2
-#ODM
-# Bit mask used to define which sensor algorithms are used.
-# Setting each bit has the following definition:
-#  0x1 - DISABLE_INS_POSITIONING_FILTER
-#  0x0 - ENABLE_INS_POSITIONING_FILTER
-SENSOR_ALGORITHM_CONFIG_MASK=0x0
-
-#Vehicle Network Provider configuration
-
-#Service configuration strings
-#The number before colon in VN_X items defines version of the format of the rest of the string
-#VN_ACCEL_CFG=0:5
-#VN_GYRO_CFG=0:5.5
-#VN_ODOMETRY_CFG=0:2,4.5
-
-################################################
-#  QDR3 configurations                         #
-################################################
-#VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2
-#VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8
-VN_SPEED_CFG=1:777,0,0,1,3,1,0.002778,0,40,8,32,8
-VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8
-
-################################################
-#  QDR2-Gyro configurations                    #
-################################################
-#VN_GYRO_CFG=1:555,0,1,0,0,0,0,-6.5,6.6066,-6.5,-1.00,2,6.607,6.6068,0,0,16,0.0002,0,16,0.0002,0,16,0.0002
-#VN_SPEED_CFG=1:555,0,0,1,2,1,0.01,0,56,8,48,8
-#VN_GEAR_CFG=1:555,16,4,0,1,1,9,0,1,2,3,4,5,6,7,8
-
-################################################
-#  QDR2-DWT configurations                     #
-################################################
-#VN_SPEED_CFG=1:555,22,1,2,1,1,1,0,8,8,23,1,2,0,1,0,8,8,23,1
-#VN_GEAR_CFG=1:555,12,4,16,14,16,8,1,2,3,4,5,6,7,8
-#VN_DWS_CFG=1:555,0,0,1,3,1,1,0,0,8,0,0,8,8,0,0,16,8,0,0,24,8,0,0
-#VN_GYRO_CFG=1:555,40,16,1.0,40,16,1.0,40,16,1.0
-
-#####################################################################################
-#                    VNW service batching configuration strings                     #
-# VNW provider will initialize default type as Time based batching                  #
-# Each service batch value is configured to be 100                                  #
-# VN_ACCEL_CFG_BATCH_VALUE will be treated as time in Ms if VN_CFG_BATCH_TYPE       #
-# is set to time based batching                                                     #
-# VN_ACCEL_CFG_BATCH_VALUE will be treated as sample count if VN_CFG_BATCH_TYPE     #
-# is set to count based batching                                                    #
-# Uncomment and update batch time /sample count as per selected batching type       #
-#####################################################################################
-# Batching type
-# 1 - Time based  (default)
-# 2 - Count based
-VN_CFG_BATCH_TYPE=1
-
-#Vehicle Accel batching value, it can either accept time in milli seconds or sample count
-#VN_ACCEL_CFG_BATCH_VALUE=100
-
-#Vehicle Gyro batching value, it can either accept time in milli seconds or sample count
-VN_GYRO_CFG_BATCH_VALUE=50
-
-#Vehicle Odo batching value, it can either accept time in milli seconds or sample count
-#VN_ODOMETRY_CFG_BATCH_VALUE=100
-
-#Vehicle Speed batching value, it can either accept time in milli seconds or sample count
-VN_SPEED_CFG_BATCH_VALUE=50
-
-#Vehicle Gear batching value, it can either accept time in milli seconds or sample count
-VN_GEAR_CFG_BATCH_VALUE=50
-
-#Vehicle DWS batching value, it can either accept time in milli seconds or sample count
-#VN_DWS_CFG_BATCH_VALUE=100
-####################################################################################
-
-#Procesors clock ratio: AP and CAN bus microcontroller
-################################################
-#  QDR3 configurations                         #
-################################################
-VN_PROC_CLOCK_RATIO=1.0
-
-################################################
-#  QDR2-DWT OR QDR2-Gyro configurations        #
-################################################
-#VN_PROC_CLOCK_RATIO = 1.0
-
-# Time source used by Sensor HAL
-# Setting this value controls accuracy of location sensor services.
-#  0 - Unknown
-#  1 - CLOCK_BOOTTIME
-#  2 - CLOCK_MONOTONIC
-#  3 - CLOCK_REALTIME
-#  4 - CLOCK_BOOTTIME using Alarm timer interface
-NDK_PROVIDER_TIME_SOURCE=1
-
-# Sensor Batching Configuration
-# 0 - Time based
-# 1 - Fixed count based
-# 2 - Variable count based
-COUNT_BASED_BATCHING=1
-SYNC_ONCE=0
-
-# Vehicle Network Data optimization
-# Default value: 0
-# Value 0x40000 -  Speed(bit 18 eSLIM_SERVICE_VEHICLE_SPEED)
-# Value 0x80000 -  Speed(bit 19 eSLIM_SERVICE_VEHICLE_DWS)
-# Value 0x100000 -  Speed(bit 20 eSLIM_SERVICE_VEHICLE_GEAR)
-VN_ENABLE_DATA_OPTIMIZATION=0x100000
-
-# Vehicle Network Data Routing time interval
-# This is applicable only if VN_ENABLE_DATA_OPTIMIZATION value is set
-# Default value: 5000 msec
-VN_DATA_ROUTING_TIME_INTERVAL_MSEC=3000
-
-#Sensor HAL Provider Configuration HAL Library name including path
-################################################
-#                                              #
-# Configuration for BMI 160 Sensor             #
-#                                              #
-################################################
-#SENSOR_TYPE=2
-#SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1
-
-################################################
-#                                              #
-# Configuration for ASM330 Sensor              #
-#                                              #
-################################################
-SENSOR_TYPE=1
-SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1
-
-
-################################################
-#                                              #
-# Configuration for IAM20680 Sensor            #
-#                                              #
-################################################
-#SENSOR_TYPE=3
-#SENSOR_HAL_LIB_PATH=/usr/lib/libiam20680sensors.so.1
-
-
-################################################
-#                                              #
-# Configuration for SMI130 Sensor              #
-#                                              #
-################################################
-#SENSOR_TYPE=4
-#SENSOR_HAL_LIB_PATH=/usr/lib/libsmi130sensors.so.1
diff --git a/proprietary/odm/firmware/fastchg/132700/oplus_vooc_fw_rt5125.bin b/proprietary/odm/firmware/fastchg/132700/oplus_vooc_fw_rt5125.bin
deleted file mode 100644
index ab1dfbf..0000000
Binary files a/proprietary/odm/firmware/fastchg/132700/oplus_vooc_fw_rt5125.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19015/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19015/oplus_vooc_fw.bin
deleted file mode 100644
index 4a024c6..0000000
Binary files a/proprietary/odm/firmware/fastchg/19015/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19016/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19016/oplus_vooc_fw.bin
deleted file mode 100644
index 573ed81..0000000
Binary files a/proprietary/odm/firmware/fastchg/19016/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19101/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19101/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19101/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19102/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19102/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19102/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19125/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19125/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19125/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19126/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19126/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19126/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19127/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19127/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19127/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19128/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19128/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19128/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19191/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19191/oplus_vooc_fw.bin
deleted file mode 100644
index e018760..0000000
Binary files a/proprietary/odm/firmware/fastchg/19191/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19192/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19192/oplus_vooc_fw.bin
deleted file mode 100644
index 655d194..0000000
Binary files a/proprietary/odm/firmware/fastchg/19192/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19335/oppo_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19335/oppo_vooc_fw.bin
deleted file mode 100644
index f3f1ed4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19335/oppo_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19501/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19501/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19501/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19517/oppo_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19517/oppo_vooc_fw.bin
deleted file mode 100644
index 9c1725a..0000000
Binary files a/proprietary/odm/firmware/fastchg/19517/oppo_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19521/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19521/oplus_vooc_fw.bin
deleted file mode 100644
index 672c8b4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19521/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19525/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19525/oplus_vooc_fw.bin
deleted file mode 100644
index 249e8d0..0000000
Binary files a/proprietary/odm/firmware/fastchg/19525/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/19591/oplus_vooc_fw.bin b/proprietary/odm/firmware/fastchg/19591/oplus_vooc_fw.bin
deleted file mode 100644
index f9ebfe4..0000000
Binary files a/proprietary/odm/firmware/fastchg/19591/oplus_vooc_fw.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20057/oplus_vooc_fw_rt5125.bin b/proprietary/odm/firmware/fastchg/20057/oplus_vooc_fw_rt5125.bin
deleted file mode 100644
index 004b7bb..0000000
Binary files a/proprietary/odm/firmware/fastchg/20057/oplus_vooc_fw_rt5125.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20058/oplus_vooc_fw_rt5125.bin b/proprietary/odm/firmware/fastchg/20058/oplus_vooc_fw_rt5125.bin
deleted file mode 100644
index 004b7bb..0000000
Binary files a/proprietary/odm/firmware/fastchg/20058/oplus_vooc_fw_rt5125.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20111/oplus_vooc_fw_op10.bin b/proprietary/odm/firmware/fastchg/20111/oplus_vooc_fw_op10.bin
deleted file mode 100644
index 9b56de6..0000000
Binary files a/proprietary/odm/firmware/fastchg/20111/oplus_vooc_fw_op10.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20113/oplus_vooc_fw_op10.bin b/proprietary/odm/firmware/fastchg/20113/oplus_vooc_fw_op10.bin
deleted file mode 100644
index 0ff1e04..0000000
Binary files a/proprietary/odm/firmware/fastchg/20113/oplus_vooc_fw_op10.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20127/oplus_vooc_fw_op10.bin b/proprietary/odm/firmware/fastchg/20127/oplus_vooc_fw_op10.bin
deleted file mode 100644
index 46f2012..0000000
Binary files a/proprietary/odm/firmware/fastchg/20127/oplus_vooc_fw_op10.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20251/oplus_vooc_fw_op10.bin b/proprietary/odm/firmware/fastchg/20251/oplus_vooc_fw_op10.bin
deleted file mode 100644
index 6f8a609..0000000
Binary files a/proprietary/odm/firmware/fastchg/20251/oplus_vooc_fw_op10.bin and /dev/null differ
diff --git a/proprietary/odm/firmware/fastchg/20669/oplus_vooc_fw_rt5125.bin b/proprietary/odm/firmware/fastchg/20669/oplus_vooc_fw_rt5125.bin
deleted file mode 100644
index 8025d24..0000000
Binary files a/proprietary/odm/firmware/fastchg/20669/oplus_vooc_fw_rt5125.bin and /dev/null differ
diff --git a/proprietary/odm/lib/vendor.oplus.hardware.orms@1.0.so b/proprietary/odm/lib/vendor.oplus.hardware.orms@1.0.so
deleted file mode 100644
index 57cebf9..0000000
Binary files a/proprietary/odm/lib/vendor.oplus.hardware.orms@1.0.so and /dev/null differ
diff --git a/proprietary/odm/lib64/vendor.oplus.hardware.appradio@1.0.so b/proprietary/odm/lib64/vendor.oplus.hardware.appradio@1.0.so
deleted file mode 100644
index ff49b51..0000000
Binary files a/proprietary/odm/lib64/vendor.oplus.hardware.appradio@1.0.so and /dev/null differ
diff --git a/proprietary/odm/lib64/vendor.oplus.hardware.ims@1.0.so b/proprietary/odm/lib64/vendor.oplus.hardware.ims@1.0.so
deleted file mode 100644
index d7c9a9a..0000000
Binary files a/proprietary/odm/lib64/vendor.oplus.hardware.ims@1.0.so and /dev/null differ
diff --git a/proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so b/proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so
deleted file mode 100644
index be00612..0000000
Binary files a/proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b00 b/proprietary/odm/vendor/firmware/widevine.b00
deleted file mode 100644
index bec6c45..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b00 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b01 b/proprietary/odm/vendor/firmware/widevine.b01
deleted file mode 100644
index 96e650f..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b01 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b02 b/proprietary/odm/vendor/firmware/widevine.b02
deleted file mode 100644
index a98672a..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b02 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b03 b/proprietary/odm/vendor/firmware/widevine.b03
deleted file mode 100644
index bc1bdc5..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b03 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b04 b/proprietary/odm/vendor/firmware/widevine.b04
deleted file mode 100644
index acc197f..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b04 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b05 b/proprietary/odm/vendor/firmware/widevine.b05
deleted file mode 100644
index 4278f77..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b05 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b06 b/proprietary/odm/vendor/firmware/widevine.b06
deleted file mode 100644
index 4117771..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b06 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.b07 b/proprietary/odm/vendor/firmware/widevine.b07
deleted file mode 100644
index dd5780e..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.b07 and /dev/null differ
diff --git a/proprietary/odm/vendor/firmware/widevine.mdt b/proprietary/odm/vendor/firmware/widevine.mdt
deleted file mode 100644
index b196589..0000000
Binary files a/proprietary/odm/vendor/firmware/widevine.mdt and /dev/null differ
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
index 54cc402..05760ee 100644
Binary files a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk and b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk differ
diff --git a/proprietary/system/etc/sysconfig/qti_whitelist.xml b/proprietary/system/etc/sysconfig/qti_whitelist.xml
index 0d0d83d..baf43cd 100644
--- a/proprietary/system/etc/sysconfig/qti_whitelist.xml
+++ b/proprietary/system/etc/sysconfig/qti_whitelist.xml
@@ -106,7 +106,6 @@
     <hidden-api-whitelisted-app package="com.android.bluetooth" />
     <hidden-api-whitelisted-app package="org.codeaurora.bluetooth" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.qmmi" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.perfdump" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
index 9640c50..7d3ef5f 100644
Binary files a/proprietary/system/framework/WfdCommon.jar and b/proprietary/system/framework/WfdCommon.jar differ
diff --git a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk
index 67a8212..b2e7437 100644
Binary files a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk and b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk b/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk
index 901803c..fc367e2 100644
Binary files a/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk and b/proprietary/system_ext/app/QtiTelephony/QtiTelephony.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index f31e0a5..544c670 100644
Binary files a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk and b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/proprietary/system_ext/bin/dpmd b/proprietary/system_ext/bin/dpmd
index 7cb9fa0..2ac31c8 100755
Binary files a/proprietary/system_ext/bin/dpmd and b/proprietary/system_ext/bin/dpmd differ
diff --git a/proprietary/system_ext/bin/tcmd b/proprietary/system_ext/bin/tcmd
index b19fc0e..4096e87 100755
Binary files a/proprietary/system_ext/bin/tcmd and b/proprietary/system_ext/bin/tcmd differ
diff --git a/proprietary/system_ext/bin/wfdservice b/proprietary/system_ext/bin/wfdservice
index ed9def1..187ba1f 100755
Binary files a/proprietary/system_ext/bin/wfdservice and b/proprietary/system_ext/bin/wfdservice differ
diff --git a/proprietary/system_ext/etc/permissions/dpmapi.xml b/proprietary/system_ext/etc/permissions/dpmapi.xml
index b718492..7c94479 100644
--- a/proprietary/system_ext/etc/permissions/dpmapi.xml
+++ b/proprietary/system_ext/etc/permissions/dpmapi.xml
@@ -5,9 +5,4 @@
 <permissions>
     <library name="dpmapi"
         file="/system/system_ext/framework/dpmapi.jar"/>
-   <!-- ifdef OPLUS_DATA_FAST_DORMANCY -->
-   <!-- MengXiangPeng@NETWORK.DATA.1610480, 2021/6/15, use sim card to load carrierconfig's fastdormancy four time parameter [OCR.527003.3.OM] -->
-    <library name="com.qti.dpmapi"
-        file="/system/system_ext/framework/dpmapi.jar"/>
-   <!-- endif OPLUS_DATA_FAST_DORMANCY -->
 </permissions>
diff --git a/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml b/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
index 55611f3..17a6390 100644
--- a/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
+++ b/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
@@ -1,6 +1,6 @@
 <!--
 /*********************************************************************
- Copyright (c) 2021 Qualcomm Technologies, Inc.
+ Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
  All Rights Reserved.
  Confidential and Proprietary - Qualcomm Technologies, Inc.
 **********************************************************************/
@@ -16,4 +16,14 @@
         file="/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"/>
     <library name="vendor.qti.ims.factory-V2.1-java"
         file="/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.factory-V2.2-java"
+        file="/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"/>
 </permissions>
diff --git a/proprietary/system_ext/etc/seccomp_policy/tcmd.policy b/proprietary/system_ext/etc/seccomp_policy/tcmd.policy
index 115862a..5ca0b9e 100644
--- a/proprietary/system_ext/etc/seccomp_policy/tcmd.policy
+++ b/proprietary/system_ext/etc/seccomp_policy/tcmd.policy
@@ -61,9 +61,12 @@ listen: 1
 restart_syscall: 1
 clone: 1
 sched_getscheduler: 1
-execve: 1
 write: 1
 socket: arg0 == AF_UNIX
 set_tid_address: 1
 rt_sigreturn: 1
-connect: 1
\ No newline at end of file
+connect: 1
+clock_gettime: 1
+gettid: 1
+rt_tgsigqueueinfo: 1
+nanosleep: 1
diff --git a/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml b/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
index 6a303d4..aa7d399 100644
--- a/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
+++ b/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
@@ -35,6 +35,10 @@ Full documentation at frameworks/base/data/etc/preinstalled-packages-platform.xm
 
     <!-- telephony-apps -->
 
+    <install-in-user-type package="com.qti.telephonysettings">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
     <install-in-user-type package="com.qualcomm.atfwd">
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
diff --git a/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml b/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
index 59c3f63..9dad8f1 100644
--- a/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
+++ b/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
@@ -31,6 +31,10 @@
 -->
 
 <config>
-<!-- Broadcast actions that are currently whitelisted. -->
-<allow-implicit-broadcast action="org.codeaurora.intent.action.CALL_COMPOSER_INFO" />
+    <!-- Broadcast actions that are currently whitelisted. -->
+    <allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+    <!-- These are location components that need to freely run in the background -->
+    <allow-in-power-save package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.skyhook.blp" />
 </config>
diff --git a/proprietary/system_ext/framework/com.qti.dpmframework.jar b/proprietary/system_ext/framework/com.qti.dpmframework.jar
index 36021cd..a289bde 100644
Binary files a/proprietary/system_ext/framework/com.qti.dpmframework.jar and b/proprietary/system_ext/framework/com.qti.dpmframework.jar differ
diff --git a/proprietary/system_ext/framework/dpmapi.jar b/proprietary/system_ext/framework/dpmapi.jar
index ecb15d8..4fa7eae 100644
Binary files a/proprietary/system_ext/framework/dpmapi.jar and b/proprietary/system_ext/framework/dpmapi.jar differ
diff --git a/proprietary/system_ext/framework/qcrilhook.jar b/proprietary/system_ext/framework/qcrilhook.jar
index 91658c4..e79a01c 100644
Binary files a/proprietary/system_ext/framework/qcrilhook.jar and b/proprietary/system_ext/framework/qcrilhook.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
index 17bf2c1..a93afe6 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar differ
diff --git a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar
index 15a3e43..7dca503 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar differ
diff --git a/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
index 7fa0f5c..c03169c 100644
Binary files a/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and b/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so differ
diff --git a/proprietary/system_ext/lib/libmmosal.so b/proprietary/system_ext/lib/libmmosal.so
index f255e0e..f73bc6d 100644
Binary files a/proprietary/system_ext/lib/libmmosal.so and b/proprietary/system_ext/lib/libmmosal.so differ
diff --git a/proprietary/system_ext/lib/libmmparser_lite.so b/proprietary/system_ext/lib/libmmparser_lite.so
index 29c0fad..9ae9658 100644
Binary files a/proprietary/system_ext/lib/libmmparser_lite.so and b/proprietary/system_ext/lib/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib/libmmrtpdecoder.so b/proprietary/system_ext/lib/libmmrtpdecoder.so
index 6d2cf5c..de0cbbd 100644
Binary files a/proprietary/system_ext/lib/libmmrtpdecoder.so and b/proprietary/system_ext/lib/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib/libmmrtpencoder.so b/proprietary/system_ext/lib/libmmrtpencoder.so
index 07b3f72..5d4204d 100644
Binary files a/proprietary/system_ext/lib/libmmrtpencoder.so and b/proprietary/system_ext/lib/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib/libwfdavenhancements.so b/proprietary/system_ext/lib/libwfdavenhancements.so
index c5c7b2f..d5a9d79 100644
Binary files a/proprietary/system_ext/lib/libwfdavenhancements.so and b/proprietary/system_ext/lib/libwfdavenhancements.so differ
diff --git a/proprietary/system_ext/lib/libwfdclient.so b/proprietary/system_ext/lib/libwfdclient.so
index 035467f..7d562ea 100644
Binary files a/proprietary/system_ext/lib/libwfdclient.so and b/proprietary/system_ext/lib/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib/libwfdcommonutils.so b/proprietary/system_ext/lib/libwfdcommonutils.so
index 2a815f1..c1db203 100644
Binary files a/proprietary/system_ext/lib/libwfdcommonutils.so and b/proprietary/system_ext/lib/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib/libwfdconfigutils.so b/proprietary/system_ext/lib/libwfdconfigutils.so
index e3311eb..3bb5c67 100644
Binary files a/proprietary/system_ext/lib/libwfdconfigutils.so and b/proprietary/system_ext/lib/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib/libwfddisplayconfig.so b/proprietary/system_ext/lib/libwfddisplayconfig.so
index bdd6ad8..6cf67fd 100644
Binary files a/proprietary/system_ext/lib/libwfddisplayconfig.so and b/proprietary/system_ext/lib/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib/libwfdmminterface.so b/proprietary/system_ext/lib/libwfdmminterface.so
index c65b930..75aef22 100644
Binary files a/proprietary/system_ext/lib/libwfdmminterface.so and b/proprietary/system_ext/lib/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib/libwfdmmsink.so b/proprietary/system_ext/lib/libwfdmmsink.so
index 00d6213..ac0661b 100644
Binary files a/proprietary/system_ext/lib/libwfdmmsink.so and b/proprietary/system_ext/lib/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib/libwfdmmsrc_system.so b/proprietary/system_ext/lib/libwfdmmsrc_system.so
index ad6bb4a..fe42c7a 100644
Binary files a/proprietary/system_ext/lib/libwfdmmsrc_system.so and b/proprietary/system_ext/lib/libwfdmmsrc_system.so differ
diff --git a/proprietary/system_ext/lib/libwfdrtsp.so b/proprietary/system_ext/lib/libwfdrtsp.so
index 88c0c2d..16e787a 100644
Binary files a/proprietary/system_ext/lib/libwfdrtsp.so and b/proprietary/system_ext/lib/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib/libwfdservice.so b/proprietary/system_ext/lib/libwfdservice.so
index dcc1033..3115b9d 100644
Binary files a/proprietary/system_ext/lib/libwfdservice.so and b/proprietary/system_ext/lib/libwfdservice.so differ
diff --git a/proprietary/system_ext/lib/libwfdsinksm.so b/proprietary/system_ext/lib/libwfdsinksm.so
index a400947..35cc6b7 100644
Binary files a/proprietary/system_ext/lib/libwfdsinksm.so and b/proprietary/system_ext/lib/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcinterface.so b/proprietary/system_ext/lib/libwfduibcinterface.so
index 52985c0..92699f4 100644
Binary files a/proprietary/system_ext/lib/libwfduibcinterface.so and b/proprietary/system_ext/lib/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsink.so b/proprietary/system_ext/lib/libwfduibcsink.so
index 80630e1..5898d12 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsink.so and b/proprietary/system_ext/lib/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsinkinterface.so b/proprietary/system_ext/lib/libwfduibcsinkinterface.so
index df1d0cf..f82d8af 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrc.so b/proprietary/system_ext/lib/libwfduibcsrc.so
index f8087d6..9651d85 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsrc.so and b/proprietary/system_ext/lib/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrcinterface.so b/proprietary/system_ext/lib/libwfduibcsrcinterface.so
index b1740f8..f90ffdb 100644
Binary files a/proprietary/system_ext/lib/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so b/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so
index 961de80..e196095 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so and b/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
index 94a87d1..d36b464 100644
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
index cf54da7..8a6d2e4 100644
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so
index ac17f00..03188a1 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvideocodec.so and b/proprietary/system_ext/lib64/lib-imsvideocodec.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvt.so b/proprietary/system_ext/lib64/lib-imsvt.so
index 345267a..802ce8f 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvt.so and b/proprietary/system_ext/lib64/lib-imsvt.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvtextutils.so b/proprietary/system_ext/lib64/lib-imsvtextutils.so
index d9a42f1..0a870b2 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtextutils.so and b/proprietary/system_ext/lib64/lib-imsvtextutils.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvtutils.so b/proprietary/system_ext/lib64/lib-imsvtutils.so
index b24d842..69386ab 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtutils.so and b/proprietary/system_ext/lib64/lib-imsvtutils.so differ
diff --git a/proprietary/system_ext/lib64/libdiag_system.so b/proprietary/system_ext/lib64/libdiag_system.so
index c4e528f..3cbe531 100644
Binary files a/proprietary/system_ext/lib64/libdiag_system.so and b/proprietary/system_ext/lib64/libdiag_system.so differ
diff --git a/proprietary/system_ext/lib64/libdpmctmgr.so b/proprietary/system_ext/lib64/libdpmctmgr.so
index 6cdb2e0..681a7fb 100644
Binary files a/proprietary/system_ext/lib64/libdpmctmgr.so and b/proprietary/system_ext/lib64/libdpmctmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmfdmgr.so b/proprietary/system_ext/lib64/libdpmfdmgr.so
index fd13462..8eb6c9e 100644
Binary files a/proprietary/system_ext/lib64/libdpmfdmgr.so and b/proprietary/system_ext/lib64/libdpmfdmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmframework.so b/proprietary/system_ext/lib64/libdpmframework.so
index b437b5c..54c5456 100644
Binary files a/proprietary/system_ext/lib64/libdpmframework.so and b/proprietary/system_ext/lib64/libdpmframework.so differ
diff --git a/proprietary/system_ext/lib64/libdpmtcm.so b/proprietary/system_ext/lib64/libdpmtcm.so
index 73b8a90..7303d36 100644
Binary files a/proprietary/system_ext/lib64/libdpmtcm.so and b/proprietary/system_ext/lib64/libdpmtcm.so differ
diff --git a/proprietary/system_ext/lib64/libimscamera_jni.so b/proprietary/system_ext/lib64/libimscamera_jni.so
index 1faac5b..5fd9aa8 100644
Binary files a/proprietary/system_ext/lib64/libimscamera_jni.so and b/proprietary/system_ext/lib64/libimscamera_jni.so differ
diff --git a/proprietary/system_ext/lib64/libimsmedia_jni.so b/proprietary/system_ext/lib64/libimsmedia_jni.so
index a14e518..8e1bac0 100644
Binary files a/proprietary/system_ext/lib64/libimsmedia_jni.so and b/proprietary/system_ext/lib64/libimsmedia_jni.so differ
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
index a7d5ff7..8717b71 100644
Binary files a/proprietary/system_ext/lib64/libmmosal.so and b/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so
index 7ea0180..7ef7ad4 100644
Binary files a/proprietary/system_ext/lib64/libmmparser_lite.so and b/proprietary/system_ext/lib64/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
index daa3643..fdb529d 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpdecoder.so and b/proprietary/system_ext/lib64/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so
index 9bee6f1..2f724ca 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.so and b/proprietary/system_ext/lib64/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
index eeaaa53..8c87228 100644
Binary files a/proprietary/system_ext/lib64/libwfdclient.so and b/proprietary/system_ext/lib64/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so
index d0c0b50..e7bf117 100644
Binary files a/proprietary/system_ext/lib64/libwfdcommonutils.so and b/proprietary/system_ext/lib64/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so
index e7e3e43..5ceb32a 100644
Binary files a/proprietary/system_ext/lib64/libwfdconfigutils.so and b/proprietary/system_ext/lib64/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so
index a36f9a0..d587503 100644
Binary files a/proprietary/system_ext/lib64/libwfddisplayconfig.so and b/proprietary/system_ext/lib64/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so
index 7434caa..b713325 100644
Binary files a/proprietary/system_ext/lib64/libwfdmminterface.so and b/proprietary/system_ext/lib64/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so
index 2e0b835..d2c52db 100644
Binary files a/proprietary/system_ext/lib64/libwfdmmsink.so and b/proprietary/system_ext/lib64/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
index a4399bf..de39222 100644
Binary files a/proprietary/system_ext/lib64/libwfdnative.so and b/proprietary/system_ext/lib64/libwfdnative.so differ
diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so
index 5b66f11..151fc6e 100644
Binary files a/proprietary/system_ext/lib64/libwfdrtsp.so and b/proprietary/system_ext/lib64/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
index 25f47cc..ec6d4e9 100644
Binary files a/proprietary/system_ext/lib64/libwfdsinksm.so and b/proprietary/system_ext/lib64/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so
index f78e6d1..8fc7422 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcinterface.so and b/proprietary/system_ext/lib64/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so
index 0773262..301b04f 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsink.so and b/proprietary/system_ext/lib64/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so
index 51b1a5d..bbfad73 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so
index 89a15b5..f2d0ad2 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrc.so and b/proprietary/system_ext/lib64/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so
index 1156d0d..a3509d7 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so
index 423bb4f..6f23d34 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so
index c96c442..604663b 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
index 4159948..a7b19d1 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
new file mode 100644
index 0000000..c6e6055
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
index 07e46d6..7e1cdac 100644
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ
diff --git a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
index 9630161..4ea03e0 100644
Binary files a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk and b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ
diff --git a/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index d41eef7..59a7c3e 100644
Binary files a/proprietary/system_ext/priv-app/ims/ims.apk and b/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 3e0dd24..0a72a96 100644
Binary files a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/proprietary/vendor/app/CACertService/CACertService.apk b/proprietary/vendor/app/CACertService/CACertService.apk
index 0bae958..507681a 100644
Binary files a/proprietary/vendor/app/CACertService/CACertService.apk and b/proprietary/vendor/app/CACertService/CACertService.apk differ
diff --git a/proprietary/vendor/app/CneApp/CneApp.apk b/proprietary/vendor/app/CneApp/CneApp.apk
index 79b3df8..afdf524 100644
Binary files a/proprietary/vendor/app/CneApp/CneApp.apk and b/proprietary/vendor/app/CneApp/CneApp.apk differ
diff --git a/proprietary/vendor/app/IWlanService/IWlanService.apk b/proprietary/vendor/app/IWlanService/IWlanService.apk
index 2a06304..ce1582b 100644
Binary files a/proprietary/vendor/app/IWlanService/IWlanService.apk and b/proprietary/vendor/app/IWlanService/IWlanService.apk differ
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
index dd88d8b..23488f4 100644
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/bin/ATFWD-daemon b/proprietary/vendor/bin/ATFWD-daemon
index 56cdb83..fb188e5 100755
Binary files a/proprietary/vendor/bin/ATFWD-daemon and b/proprietary/vendor/bin/ATFWD-daemon differ
diff --git a/proprietary/vendor/bin/adpl b/proprietary/vendor/bin/adpl
index 6264e6c..566811b 100755
Binary files a/proprietary/vendor/bin/adpl and b/proprietary/vendor/bin/adpl differ
diff --git a/proprietary/vendor/bin/adsprpcd b/proprietary/vendor/bin/adsprpcd
index 23b1d6a..a2cd87a 100755
Binary files a/proprietary/vendor/bin/adsprpcd and b/proprietary/vendor/bin/adsprpcd differ
diff --git a/proprietary/vendor/bin/cdsprpcd b/proprietary/vendor/bin/cdsprpcd
index c622cee..be459ac 100755
Binary files a/proprietary/vendor/bin/cdsprpcd and b/proprietary/vendor/bin/cdsprpcd differ
diff --git a/proprietary/vendor/bin/cnd b/proprietary/vendor/bin/cnd
index 6b69a28..f50073f 100755
Binary files a/proprietary/vendor/bin/cnd and b/proprietary/vendor/bin/cnd differ
diff --git a/proprietary/vendor/bin/dpmQmiMgr b/proprietary/vendor/bin/dpmQmiMgr
index d7e76a9..2d664ec 100755
Binary files a/proprietary/vendor/bin/dpmQmiMgr and b/proprietary/vendor/bin/dpmQmiMgr differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
index 64838cb..bdc9a62 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
deleted file mode 100644
index ebfba7f..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
new file mode 100644
index 0000000..e55cdb8
Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
index fd07a1a..0cf1009 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti and b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti differ
diff --git a/proprietary/vendor/bin/hw/qcrild b/proprietary/vendor/bin/hw/qcrild
index 3bc6407..aa20b07 100644
Binary files a/proprietary/vendor/bin/hw/qcrild and b/proprietary/vendor/bin/hw/qcrild differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
index 4f252d9..df1a557 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
index 552f9f0..3209ffd 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service
index 3f43ecd..7f272b7 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
index e23ec2d..e72241d 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti b/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
index 148b55a..a749efc 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti and b/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti differ
diff --git a/proprietary/vendor/bin/ims_rtp_daemon b/proprietary/vendor/bin/ims_rtp_daemon
index 8693891..c561ca4 100755
Binary files a/proprietary/vendor/bin/ims_rtp_daemon and b/proprietary/vendor/bin/ims_rtp_daemon differ
diff --git a/proprietary/vendor/bin/imsdatadaemon b/proprietary/vendor/bin/imsdatadaemon
index cbc5060..e3f4720 100755
Binary files a/proprietary/vendor/bin/imsdatadaemon and b/proprietary/vendor/bin/imsdatadaemon differ
diff --git a/proprietary/vendor/bin/imsqmidaemon b/proprietary/vendor/bin/imsqmidaemon
index 4524c91..4daf26d 100755
Binary files a/proprietary/vendor/bin/imsqmidaemon and b/proprietary/vendor/bin/imsqmidaemon differ
diff --git a/proprietary/vendor/bin/imsrcsd b/proprietary/vendor/bin/imsrcsd
index 82e3e58..3ec2670 100755
Binary files a/proprietary/vendor/bin/imsrcsd and b/proprietary/vendor/bin/imsrcsd differ
diff --git a/proprietary/vendor/bin/init.qti.chg_policy.sh b/proprietary/vendor/bin/init.qti.chg_policy.sh
index 99187ab..fe679b3 100755
--- a/proprietary/vendor/bin/init.qti.chg_policy.sh
+++ b/proprietary/vendor/bin/init.qti.chg_policy.sh
@@ -1,7 +1,7 @@
 #! /vendor/bin/sh
 
 #
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -11,7 +11,7 @@
 export PATH=/vendor/bin
 
 soc_id=`getprop ro.vendor.qti.soc_id`
-if [ "$soc_id" -eq 415 ] || [ "$soc_id" -eq 439 ] || [ "$soc_id" -eq 450 ] || [ "$soc_id" -eq 475 ]; then
+if [ "$soc_id" -eq 415 ] || [ "$soc_id" -eq 439 ] || [ "$soc_id" -eq 450 ] || [ "$soc_id" -eq 475 ] || [ "$soc_id" -eq 497 ] || [ "$soc_id" -eq 498 ] || [ "$soc_id" -eq 499 ] || [ "$soc_id" -eq 515 ]; then
     setprop persist.vendor.hvdcp_opti.start 2
     exit 0
 fi
@@ -39,7 +39,7 @@ else
 	for i in 0 1 2 3 4 5 6 7 8 9
 	do
 		devname=`cat /sys/bus/iio/devices/iio:device$i/name`
-		if [[ "$devname" == *smb* ]] || [[ "$devname" == *qg* ]] || [[ "$devname" == *div2_cp* ]]; then
+		if [[ "$devname" == *smb* ]] || [[ "$devname" == *qg* ]] || [[ "$devname" == *div2_cp* ]] || [[ "$devname" == *div2-cp* ]]; then
 			find /sys/bus/iio/devices/iio:device$i/ -type f -maxdepth 1 | xargs chown system.system
 		fi
 	done
diff --git a/proprietary/vendor/bin/irsc_util b/proprietary/vendor/bin/irsc_util
index 5907536..bf79f38 100755
Binary files a/proprietary/vendor/bin/irsc_util and b/proprietary/vendor/bin/irsc_util differ
diff --git a/proprietary/vendor/bin/ks b/proprietary/vendor/bin/ks
index 2fea801..23a4ba5 100755
Binary files a/proprietary/vendor/bin/ks and b/proprietary/vendor/bin/ks differ
diff --git a/proprietary/vendor/bin/loc_launcher b/proprietary/vendor/bin/loc_launcher
index e76e027..78cd6ab 100755
Binary files a/proprietary/vendor/bin/loc_launcher and b/proprietary/vendor/bin/loc_launcher differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index 899f5b2..c4de604 100755
Binary files a/proprietary/vendor/bin/lowi-server and b/proprietary/vendor/bin/lowi-server differ
diff --git a/proprietary/vendor/bin/mlid b/proprietary/vendor/bin/mlid
index 697ea01..917e1ff 100755
Binary files a/proprietary/vendor/bin/mlid and b/proprietary/vendor/bin/mlid differ
diff --git a/proprietary/vendor/bin/msm_irqbalance b/proprietary/vendor/bin/msm_irqbalance
index f3361be..bd0595a 100755
Binary files a/proprietary/vendor/bin/msm_irqbalance and b/proprietary/vendor/bin/msm_irqbalance differ
diff --git a/proprietary/vendor/bin/mutualex b/proprietary/vendor/bin/mutualex
index 74ae760..20403bd 100755
Binary files a/proprietary/vendor/bin/mutualex and b/proprietary/vendor/bin/mutualex differ
diff --git a/proprietary/vendor/bin/netmgrd b/proprietary/vendor/bin/netmgrd
index b8f7792..323b232 100755
Binary files a/proprietary/vendor/bin/netmgrd and b/proprietary/vendor/bin/netmgrd differ
diff --git a/proprietary/vendor/bin/pd-mapper b/proprietary/vendor/bin/pd-mapper
index f43c1b5..caa121c 100755
Binary files a/proprietary/vendor/bin/pd-mapper and b/proprietary/vendor/bin/pd-mapper differ
diff --git a/proprietary/vendor/bin/pm-proxy b/proprietary/vendor/bin/pm-proxy
index e66cbad..2238e41 100755
Binary files a/proprietary/vendor/bin/pm-proxy and b/proprietary/vendor/bin/pm-proxy differ
diff --git a/proprietary/vendor/bin/pm-service b/proprietary/vendor/bin/pm-service
index 4c3c5dc..83f17f1 100755
Binary files a/proprietary/vendor/bin/pm-service and b/proprietary/vendor/bin/pm-service differ
diff --git a/proprietary/vendor/bin/port-bridge b/proprietary/vendor/bin/port-bridge
index ddd3877..ab9ab68 100755
Binary files a/proprietary/vendor/bin/port-bridge and b/proprietary/vendor/bin/port-bridge differ
diff --git a/proprietary/vendor/bin/qmipriod b/proprietary/vendor/bin/qmipriod
index c3e6902..399d8af 100755
Binary files a/proprietary/vendor/bin/qmipriod and b/proprietary/vendor/bin/qmipriod differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
index 9f0c406..e2ceff7 100755
Binary files a/proprietary/vendor/bin/qseecomd and b/proprietary/vendor/bin/qseecomd differ
diff --git a/proprietary/vendor/bin/qti b/proprietary/vendor/bin/qti
index 8ff9d35..ee95a09 100755
Binary files a/proprietary/vendor/bin/qti and b/proprietary/vendor/bin/qti differ
diff --git a/proprietary/vendor/bin/rmt_storage b/proprietary/vendor/bin/rmt_storage
index bc50280..2e45348 100755
Binary files a/proprietary/vendor/bin/rmt_storage and b/proprietary/vendor/bin/rmt_storage differ
diff --git a/proprietary/vendor/bin/shsusrd b/proprietary/vendor/bin/shsusrd
index 6ddefa9..f1131c2 100755
Binary files a/proprietary/vendor/bin/shsusrd and b/proprietary/vendor/bin/shsusrd differ
diff --git a/proprietary/vendor/bin/slim_daemon b/proprietary/vendor/bin/slim_daemon
index ddb9458..a29d896 100755
Binary files a/proprietary/vendor/bin/slim_daemon and b/proprietary/vendor/bin/slim_daemon differ
diff --git a/proprietary/vendor/bin/ssgtzd b/proprietary/vendor/bin/ssgtzd
index 4710388..ffe9311 100755
Binary files a/proprietary/vendor/bin/ssgtzd and b/proprietary/vendor/bin/ssgtzd differ
diff --git a/proprietary/vendor/bin/tftp_server b/proprietary/vendor/bin/tftp_server
index 0439fbf..ff7af7d 100755
Binary files a/proprietary/vendor/bin/tftp_server and b/proprietary/vendor/bin/tftp_server differ
diff --git a/proprietary/vendor/bin/thermal-engine b/proprietary/vendor/bin/thermal-engine
index 48d4dd3..fd7d935 100755
Binary files a/proprietary/vendor/bin/thermal-engine and b/proprietary/vendor/bin/thermal-engine differ
diff --git a/proprietary/vendor/bin/time_daemon b/proprietary/vendor/bin/time_daemon
index 503aafc..3578837 100755
Binary files a/proprietary/vendor/bin/time_daemon and b/proprietary/vendor/bin/time_daemon differ
diff --git a/proprietary/vendor/bin/vppservice b/proprietary/vendor/bin/vppservice
index 6469b6c..2e472cd 100755
Binary files a/proprietary/vendor/bin/vppservice and b/proprietary/vendor/bin/vppservice differ
diff --git a/proprietary/vendor/bin/wfdhdcphalservice b/proprietary/vendor/bin/wfdhdcphalservice
index 503b1cc..d795d3c 100755
Binary files a/proprietary/vendor/bin/wfdhdcphalservice and b/proprietary/vendor/bin/wfdhdcphalservice differ
diff --git a/proprietary/vendor/bin/wfdvndservice b/proprietary/vendor/bin/wfdvndservice
index 5982266..1592ab9 100755
Binary files a/proprietary/vendor/bin/wfdvndservice and b/proprietary/vendor/bin/wfdvndservice differ
diff --git a/proprietary/vendor/bin/wifidisplayhalservice b/proprietary/vendor/bin/wifidisplayhalservice
index b33e383..b7e54a7 100755
Binary files a/proprietary/vendor/bin/wifidisplayhalservice and b/proprietary/vendor/bin/wifidisplayhalservice differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index a12221a..bc673a1 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/bin/xtwifi-client b/proprietary/vendor/bin/xtwifi-client
index 9f351bf..e940e5f 100755
Binary files a/proprietary/vendor/bin/xtwifi-client and b/proprietary/vendor/bin/xtwifi-client differ
diff --git a/proprietary/vendor/bin/xtwifi-inet-agent b/proprietary/vendor/bin/xtwifi-inet-agent
index b7f9c99..7a2d557 100755
Binary files a/proprietary/vendor/bin/xtwifi-inet-agent and b/proprietary/vendor/bin/xtwifi-inet-agent differ
diff --git a/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg b/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg
deleted file mode 100644
index d68737c..0000000
--- a/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg
+++ /dev/null
@@ -1,130 +0,0 @@
-#Main logging indication
-EnableLogs=True
-
-#Debug detailing level
-#if commented \ removed it will use default: full info
-# 0 - nothing
-# 3 - critical errors
-# 5 - critical info
-# 10 - errors
-# 30 - warnings
-# 40 - info
-# 50 - additional info
-# 60 - full info
-DebugLevel=40
-
-#Directory of HDCP TrustZone application file
-#Uncomment the following line in order to override system default value
-#ifdef VENDOR_EDIT
-#Long.Liu@BSP.Fingerprint.Secure , 2020/06/08, modify for HDCP ta PATH
-TzAppPath=/odm/vendor/firmware
-#TzAppPath=/vendor/firmware
-#endif
-
-#Secure File System path.
-#In Arm HDCP versions prior to 4.0.0, this parameter was named "UserRootDir".
-#Unless required for backward compatibility, Arm recommends not to change the value of this parameter.
-#SfsPath=/persist/data
-
-#Enable / Disable file logs. If set to "False" - file logs will be disabled
-UseLogFile=False
-LogPath=/data/local/tmp
-LogFileName=hdcp.log
-LogFileMaxSize=52428800
-MaxNumOfLogFiles=40
-
-#Merge the client logs into logcat
-#comment out \ remove to disable
-LogcatLogs=True
-
-#Enable stdout logs. For production devices, this parameter must be set to False
-StdoutLogs=False
-
-#HLOS data dir, comment out \ remove to enable default value (/data/system)
-HlosDataDir = /data/system
-
-#Set True/False
-#Set value for capbiliy mask : TRANSMITTER_LOCALITY_PRECOMPUTE_SUPPORT_BIT_MASK and RECEIVER_LOCALITY_PRECOMPUTE_SUPPORT_BIT_MASK as part of spcification. Default value is True.
-IsLocalityCheckPreComputeSupported=True
-
-#Transmitter only - number of Max LC retries, for any reason. This should not exceed the spcification 1023 re-attempts. For the total number of attempts, add 1 to this parameter.
-#if commented \ removed it will use default (1023)
-TotalLcRetries=1023
-
-#Transmitter only - number of LC retries, out of the total TotalLcRetries, which are due to LC_SEND_L_PRIME not arrived in pre-compute mode, or due to cryptographic failured caused by a LC_SEND_L_PRIME arriving in delay, 
-# or wrong LC_SEND_L_PRIME content
-#These retries are subset of the total retries in TotalLcRetries, so this parameter should be always less than the maximum specification allowed 1023 retries, but must also be less than TotalLcRetries
-#This parameter will leave total number of TotalLcRetries-HlosLcTimeoutRetries retries due to the case of message arrived too late (more than 7ms, verified in TEE)
-HlosLcTimeoutRetries=9
-#for locality check with pre-compute capability - time for retry in soruce (in HLOS), in case that no message received from sink
-LcPreComputeHlosTimeout=100
-
-#overall connection timeout
-#remove \ comment to use default (10000)
-UpstreamOverallAuthenticationTimeout=10000
-DownsOverallAuthenticationTimeout=10000
-
-#Avoid HDCP timeouts - Possible in testing Keys only. May be used for debug purposes. All HDCP protocol timeouts will be avoided, excluding receiver timeouts will HDCP 2.2 Transmitter is working with HDCP 2.0 receiver. 
-#Secure timestamp checking in Locality check and propagations will be avoided too.
-AvoidTimeouts=False
-
-# Override the default TEE service logging mechanism. Any combination of True/False is valid.
-# The settings is secondary. Leave undefined to use platform defaults (recommended!)
-TeeNativeLogging=False
-TeeSerializedLogging=True
-
-# Logger Queue number of slots
-# The value should be power of 2 that is greater than or equal to 128 (i.e 128, 256, 512 ...)
-# Default value 4096
-LoggerQueueSize=4096
-
-# When IsSinkDualModeEnabled is True, the sink can switch between repeater and receiver
-# depending if it has populated topology beneath it. When IsSinkDualModeEnabled is False,
-# the sink will always identify itself as a repeater and if there is no devices beneath it,
-# it will have zero-size receiver ID list in its topology.
-# Default is True.
-IsSinkDualModeEnabled=True
-
-# When SinkSendVPrimeMSB is True, Sink sends the most significant 128-bits of V' during upstream
-# propagation, as required by the HDCP specification. When SinkSendVPrimeMSB is False, Sink sends
-# the least significant 128-bits of V' during upstream propagation, inconsistently with the HDCP
-# specification, but without compromising security. This allows Sink to work against 3rd party
-# devices who violate the HDCP specification.
-# Default is False.
-SinkSendVPrimeMSB=False
-
-# Size (in bytes) for hlos-ptr shared memory. Default: 2097152 (2MB)
-# When EArmHdcpBufferType::ARM_HDCP_BUFFER_TYPE_VIRTUAL_POINTER type is used for cipher buffers, an intermediate ION buffer should be allocated.
-# Size of the pre-allocated ION buffer is defined by SizeBytesForHlosPtrAsSharedMemRef value.
-# If SizeBytesForHlosPtrAsSharedMemRef is set to 0, cipher calls with EArmHdcpBufferType::ARM_HDCP_BUFFER_TYPE_VIRTUAL_POINTER type will fail.
-# When using Google WFD with libstagefright_hdcp.so this parameter should be set to 2 * maximum needed buffer size per encrypt operation and rounded up to 4096 bytes boundary
-SizeBytesForHlosPtrAsSharedMemRef=0
-
-# Optional ION buffer parameters
-
-# When SizeBytesForHlosPtrAsSharedMemRef > 0, the following parameters used for pre-allocated ION buffer allocation.
-# Note: HDCP test application require SizeBytesForHlosPtrAsSharedMemRef=2097152
-
-# Non-secure ION heap ID. Default: 27   (27=ION_QSECOM_HEAP_ID)
-# NON_SECURE_ION_HEAP_ID=27
-
-# Alignment in KB for non-secure buffer allocation using ION heap. Default: 4
-# NON_SECURE_ION_HEAP_ALIGN_KB=4
-
-# Non-secure ION buffer allocation flags. Default: 0
-# NON_SECURE_ION_HEAP_FLAGS=0
-
-# The following parameters used for secure ION buffers allocation (for test purpose only)
-
-# Secure ION heap ID. Default: 9   (9=ION_SECURE_HEAP_ID)
-# TEST_SECURE_ION_HEAP_ID=9
-
-# Alignment in KB for secure buffer allocation using ION heap. Default: 4
-# TEST_SECURE_ION_HEAP_ALIGN_KB=4
-
-# Secure ION buffer allocation flags. Default: 2147745792 (2147745792 = 0x80040000 = (ION_SECURE | ION_FLAG_CP_BITSTREAM))
-# TEST_SECURE_ION_HEAP_FLAGS=2147745792
-
-# TEST_SECURE_ION_HEAP_USE_TAG_MEM can be False (Default) or True
-# Set TEST_SECURE_ION_HEAP_USE_TAG_MEM to 1 to enforce qsee_tag_mem(AC_VM_CP_BITSTREAM, ...) call for each allocated ION secure buffer
-# TEST_SECURE_ION_HEAP_USE_TAG_MEM=False
diff --git a/proprietary/vendor/etc/apdr.conf b/proprietary/vendor/etc/apdr.conf
index 5a9a922..ea2ec52 100644
--- a/proprietary/vendor/etc/apdr.conf
+++ b/proprietary/vendor/etc/apdr.conf
@@ -69,11 +69,6 @@ QDR_CAN_TYPE = 14
 ##Reporting offset before PPS boundary
 QDR_REPORTING_OFFSET = 20
 #
-##QDR_ENABLE_QG shall be set as 1
-QDR_ENABLE_QG = 1
-#GEAR Optimisation
-QG_GEAR_ON_CHANGE=1
-#
 
 ##Vehicle Sensor Configuration (CAN data availability)
 ##QDR_VEH_SENSOR_CONFIG:
diff --git a/proprietary/vendor/etc/cne/mwqem.conf b/proprietary/vendor/etc/cne/mwqem.conf
index 66cfede..fb44c05 100644
--- a/proprietary/vendor/etc/cne/mwqem.conf
+++ b/proprietary/vendor/etc/cne/mwqem.conf
@@ -14,4 +14,4 @@ lqa_update_threshold:0.25
 #in this duration
 lqa_update_count_timer:10000
 #default URL for establishing a tcp sessions
-mwqem_http_url:www.qualcomm.com
+mwqem_http_url:www.qualcomm.com
\ No newline at end of file
diff --git a/proprietary/vendor/etc/configstore/vpp.configstore.xml b/proprietary/vendor/etc/configstore/vpp.configstore.xml
index aea3238..61def20 100644
--- a/proprietary/vendor/etc/configstore/vpp.configstore.xml
+++ b/proprietary/vendor/etc/configstore/vpp.configstore.xml
@@ -7,12 +7,9 @@ Confidential and Proprietary - Qualcomm Technologies, Inc.
 
 <CapabilityStore version="1">
     <namespace name="vpp">
-        <!-- #ifdef OPLUS_FEATURE_HQV -->
-        <!-- Yugang.Ma@PSW.MM.MediaServer.Player, 2019/09/20, [Modify for HQV feature]-->
         <capability key="default_config" value="false"/>
         <capability key="disable_dynamic_hal" value="true"/>
-        <capability key="enable" value="true"/>
-        <!-- #endif OPLUS_FEATURE_HQV-->
+        <capability key="enable" value="false"/>
         <capability key="enable_idle_timeout" value="true"/>
         <capability key="idle_timeout_ms" value="1000"/>
     </namespace>
diff --git a/proprietary/vendor/etc/data/dsi_config.xml b/proprietary/vendor/etc/data/dsi_config.xml
index 752ac43..14d9028 100644
--- a/proprietary/vendor/etc/data/dsi_config.xml
+++ b/proprietary/vendor/etc/data/dsi_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      DSI Module configuration XML file
-     Copyright (c) 2013, 2015, 2017-2020 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2015, 2017-2021 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -1258,5 +1258,139 @@
        <data type="string"> rmnet_data16 </data>
      </list>
    </listitem>
+
+   <!-- Configuration for lahaina_pt -->
+   <listitem name="lahaina_pt">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 17 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for monaco-->
+   <listitem name="monaco">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 11 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for QTang  -->
+   <listitem name="qtang">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 11 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+     </list>
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+     </list>
+   </listitem>
 </list>
 
diff --git a/proprietary/vendor/etc/data/netmgr_config.xml b/proprietary/vendor/etc/data/netmgr_config.xml
index 4164f86..3b82771 100644
--- a/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/proprietary/vendor/etc/data/netmgr_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Netmgr Module configuration XML file
-     Copyright (c) 2013, 2016-2020 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2016-2022 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -2570,7 +2570,7 @@
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
       <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="rmnet_perf" type="int"> 1 </data>
-      <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="rmnet_shs" type="int"> 2 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
@@ -2677,16 +2677,8 @@
       <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
       <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <!-- #ifdef OPLUS_BUG_STABILITY -->
-      <!-- YangHao@BSP.STABILITY, 2020/04/03, for ipa crash issue -->
-      <!--
       <data name="rsc" type="int"> 1 </data>
       <data name="rsb" type="int"> 1 </data>
-      -->
-      <!-- #else -->
-      <data name="rsc" type="int"> 0 </data>
-      <data name="rsb" type="int"> 0 </data>
-      <!-- #endif /* OPLUS_BUG_STABILITY */ -->
       <data name="mhip" type="int"> 1 </data>
       <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
@@ -2811,6 +2803,7 @@
       <data name="kfc_mode" type="int"> 4 </data>
       <data name="kfc_qmap" type="int"> 1 </data>
       <data name="qmi_pc" type="int"> 1 </data>
+      <data name="dfc_ps_ext" type="int"> 0 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
@@ -2830,16 +2823,8 @@
       <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
       <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <!-- #ifdef OPLUS_BUG_STABILITY -->
-      <!-- YangHao@BSP.STABILITY, 2020/04/03, for ipa crash issue -->
-      <!--
       <data name="rsc" type="int"> 1 </data>
       <data name="rsb" type="int"> 1 </data>
-      -->
-      <!-- #else -->
-      <data name="rsc" type="int"> 0 </data>
-      <data name="rsb" type="int"> 0 </data>
-      <!-- #endif /* OPLUS_BUG_STABILITY */ -->
       <data name="mhip" type="int"> 1 </data>
       <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
@@ -2954,11 +2939,6 @@
       </list>
       <!-- Number of above reverse data ports inited on bootup -->
       <data name="static_rev_links" type="int"> 4 </data>
-
-     <!-- #ifdef OPLUS_BUG_STABILITY -->
-     <!-- Liwei@Connectivity.NETWORK, 2021/04/25, for set default tcp_mtu_probing-->
-     <data name="tcp_mtu_probing" type="int"> 1 </data>
-     <!-- #endif /* OPLUS_BUG_STABILITY */ -->
    </listitem>
 
   <!-- lito parameters -->
@@ -2990,16 +2970,8 @@
       <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
       <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
-      <!-- #ifdef OPLUS_BUG_STABILITY -->
-      <!-- YangHao@BSP.STABILITY, 2020/04/03, for ipa crash issue -->
-      <!--
       <data name="rsc" type="int"> 1 </data>
       <data name="rsb" type="int"> 1 </data>
-      -->
-      <!-- #else -->
-      <data name="rsc" type="int"> 0 </data>
-      <data name="rsb" type="int"> 0 </data>
-      <!-- #endif /* OPLUS_BUG_STABILITY */ -->
       <data name="rmnet_shs" type="int"> 1 </data>
       <data name="rmnet_perf" type="int"> 3 </data>
       <data name="uplink_priority" type="int"> 1 </data>
@@ -3108,11 +3080,6 @@
      </list>
      <!-- Number of above reverse data ports inited on bootup -->
      <data name="static_rev_links" type="int"> 4 </data>
-
-     <!-- #ifdef OPLUS_BUG_STABILITY -->
-     <!-- Liwei@Connectivity.NETWORK, 2021/04/25, for set default tcp_mtu_probing-->
-     <data name="tcp_mtu_probing" type="int"> 1 </data>
-     <!-- #endif /* OPLUS_BUG_STABILITY */ -->
    </listitem>
 
    <!-- lahaina parameters -->
@@ -3256,10 +3223,378 @@
       </list>
       <!-- Number of above reverse data ports inited on bootup -->
       <data name="static_rev_links" type="int"> 4 </data>
+   </listitem>
 
-     <!-- #ifdef OPLUS_BUG_STABILITY -->
-     <!-- Liwei@Connectivity.NETWORK, 2021/04/25, for set default tcp_mtu_probing-->
-     <data name="tcp_mtu_probing" type="int"> 1 </data>
-     <!-- #endif /* OPLUS_BUG_STABILITY */ -->
+   <!-- lahaina_pt parameters -->
+   <listitem name = "lahaina_pt">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
+      <data name="kfc_qmap" type="int"> 1 </data>
+      <data name="qmi_pc" type="int"> 1 </data>
+      <data name="tcp_ack_prio" type="int"> 1 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 63 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 64844 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
+      <data name="dataformat_agg_ul_time" type="int"> 1000000 </data>
+      <data name="dataformat_agg_ul_features" type="int"> 1 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
+      <data name="rsc" type="int"> 2 </data>
+      <data name="rsb" type="int"> 2 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rmnet_offload" type="int"> 1 </data>
+      <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="uplink_priority" type="int"> 1 </data>
+      <data name="iwlan_concurrency" type="int"> 1 </data>
+      <data name="nl_xfrm" type="int"> 1 </data>
+      <data name="netdev_max_backlog" type="int"> 100000 </data>
+      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
+
+      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
+      <data name="disable_hystart" type="int"> 1 </data>
+      <data name="initial_ssthresh" type="int"> 1400 </data>
+      <data name="dl_marker_enabled" type="int"> 2 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 125 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 17 </data>
+      <list name="control_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 17 </data>
+      <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
+      </list>
+      <!-- Number of above data ports inited on bootup -->
+      <data name="static_fwd_links" type="int"> 6 </data>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 16 </data>
+      <list name="rev_control_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 16 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
+      </list>
+      <!-- Number of above reverse data ports inited on bootup -->
+      <data name="static_rev_links" type="int"> 4 </data>
+   </listitem>
+
+   <!-- monaco parameters -->
+   <listitem name = "monaco">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 0 </data>
+      <data name="kfc_qmap" type="int"> 0 </data>
+      <data name="qmi_pc" type="int"> 0 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="tc_ul_baserate" type="int"> 155000000 </data>
+      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
+      <data name="tc_ul_burst" type="int"> 25000 </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_time" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_features" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
+      <data name="rsc" type="int"> 0 </data>
+      <data name="rsb" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rmnet_offload" type="int"> 0 </data>
+      <data name="rmnet_shs" type="int"> 0 </data>
+      <data name="uplink_priority" type="int"> 0 </data>
+      <data name="iwlan_concurrency" type="int"> 1 </data>
+      <data name="nl_xfrm" type="int"> 1 </data>
+      <data name="netdev_max_backlog" type="int"> 10000 </data>
+      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
+      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
+
+      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
+      <data name="disable_hystart" type="int"> 1 </data>
+      <data name="initial_ssthresh" type="int"> 1400 </data>
+      <data name="dl_marker_enabled" type="int"> 0 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 12 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 11 </data>
+      <list name="control_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 11 </data>
+      <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+      </list>
+      <!-- Number of above data ports inited on bootup -->
+      <data name="static_fwd_links" type="int"> 6 </data>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+      <!-- Number of above reverse data ports inited on bootup -->
+      <data name="static_rev_links" type="int"> 4 </data>
+   </listitem>
+
+   <!-- QTang parameters -->
+   <listitem name = "qtang">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
+      <data name="qmi_pc" type="int"> 1 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="tc_ul_baserate" type="int"> 155000000 </data>
+      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
+      <data name="tc_ul_burst" type="int"> 25000 </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
+      <data name="netdev_max_backlog" type="int"> 10000 </data>
+
+      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
+      <data name="disable_hystart" type="int"> 1 </data>
+      <data name="initial_ssthresh" type="int"> 1400 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 12 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+      <data name="tcp_mtu_probing" type="int"> 2 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="skip_buffered_qos_modify" type="int"> 1 </data>
+
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 11 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+         <data type="string"> rmnet_data8 </data>
+         <data type="string"> rmnet_data9 </data>
+         <data type="string"> rmnet_data10 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 11 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+         <data type="string"> rmnet_data8 </data>
+         <data type="string"> rmnet_data9 </data>
+         <data type="string"> rmnet_data10 </data>
+      </list>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> r_rmnet_data0 </data>
+         <data type="string"> r_rmnet_data1 </data>
+         <data type="string"> r_rmnet_data2 </data>
+         <data type="string"> r_rmnet_data3 </data>
+         <data type="string"> r_rmnet_data4 </data>
+         <data type="string"> r_rmnet_data5 </data>
+         <data type="string"> r_rmnet_data6 </data>
+         <data type="string"> r_rmnet_data7 </data>
+         <data type="string"> r_rmnet_data8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
    </listitem>
 </list>
diff --git a/proprietary/vendor/etc/gps.conf b/proprietary/vendor/etc/gps.conf
index 65a15b0..75f12f2 100644
--- a/proprietary/vendor/etc/gps.conf
+++ b/proprietary/vendor/etc/gps.conf
@@ -12,12 +12,7 @@ XTRA_CA_PATH=/usr/lib/ssl-1.1/certs
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-#ifndef OPLUS_BUG_DEBUG
-#LinHuaqiu@CONNECTIVITY.GPS.LOCATION.LOG.1065783, 2017/11/04, Add for gps log control
-#DEBUG_LEVEL = 3
-#else /* OPLUS_BUG_DEBUG */
-DEBUG_LEVEL = 2
-#endif /* OPLUS_BUG_DEBUG */
+DEBUG_LEVEL = 3
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
@@ -313,12 +308,7 @@ MODEM_TYPE = 1
 #####################################
 # This is a string that is sent to the framework
 # in nfwNotifyCb callback
-#ifndef OPLUS_BUG_STABILITY
-#LiZhilong@CONNECTIVITY.GPS.LOCATION.OPCUSTOMIZED.2786815, 2020/01/10, Modify for nfw proxy app
-#PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
-#else /* OPLUS_BUG_STABILITY */
-PROXY_APP_PACKAGE_NAME = com.oplus.locationproxy
-#endif /* OPLUS_BUG_STABILITY */
+PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
 
 #####################################
 # CP_MTLR_ES
diff --git a/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
index 47091e6..f919a5e 100644
--- a/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
+++ b/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
@@ -1,3 +1,9 @@
+on property:vendor.keymaster.quickboot=true
+     stop gatekeeper-1-0
+     start gatekeeper-1-0
+     stop gatekeeperd
+     start gatekeeperd
+
 service gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
     class early_hal
     user system
diff --git a/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
deleted file mode 100644
index 94783de..0000000
--- a/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-on init
-    start keymaster-4-0
-
-service keymaster-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
-    class early_hal
-    user system
-    group system drmrpc
diff --git a/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
new file mode 100644
index 0000000..811ebfd
--- /dev/null
+++ b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
@@ -0,0 +1,14 @@
+on init
+    start vendor.keymaster-4-1
+
+on property:vendor.keymaster.quickboot=true
+   stop vendor.keymaster-4-1
+   start vendor.keymaster-4-1
+   stop keystore
+   start keystore
+   start wait_for_keymaster
+
+service vendor.keymaster-4-1 /vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
+    class early_hal
+    user system
+    group system drmrpc
diff --git a/proprietary/vendor/etc/init/init_thermal-engine.rc b/proprietary/vendor/etc/init/init_thermal-engine.rc
index d99f02a..3cc069c 100644
--- a/proprietary/vendor/etc/init/init_thermal-engine.rc
+++ b/proprietary/vendor/etc/init/init_thermal-engine.rc
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#Copyright (c) 2019 Qualcomm Technologies, Inc.
+#Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 #All Rights Reserved.
 #Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -15,3 +15,6 @@ service thermal-engine /vendor/bin/thermal-engine
 	socket thermal-recv-client stream 0660 system oem_2907
 	socket thermal-recv-passive-client stream 0660 system oem_2907
 	socket thermal-send-rule stream 0660 system oem_2907
+
+on property:sys.boot_completed=1
+	restart thermal-engine
diff --git a/proprietary/vendor/etc/init/netmgrd.rc b/proprietary/vendor/etc/init/netmgrd.rc
index d5ec974..755090a 100644
--- a/proprietary/vendor/etc/init/netmgrd.rc
+++ b/proprietary/vendor/etc/init/netmgrd.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -18,10 +18,6 @@ on boot
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_ctl
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_core
 
-on boot
-    #Reduce the pressure on the reassemly cache by discarding orphan fragments quicker
-    write /proc/sys/net/netfilter/nf_conntrack_frag6_timeout 10
-
 # msm specific files that need to be created on /data
 on post-fs-data
     #Create NETMGR daemon log dir
diff --git a/proprietary/vendor/etc/init/qcrild.rc b/proprietary/vendor/etc/init/qcrild.rc
index 6f7dd57..8aabd73 100644
--- a/proprietary/vendor/etc/init/qcrild.rc
+++ b/proprietary/vendor/etc/init/qcrild.rc
@@ -2,35 +2,19 @@ service vendor.qcrild /vendor/bin/hw/qcrild
     class main
     user radio
     disabled
-    #ifdef OPLUS_FEATURE_OEM_QMI
-    #TanZhengpeng@NETWORK.REG.919197, 2016/06/04, modify for Oem qmi service
-    #group radio cache inet misc audio log readproc wakelock oem_2901
-    #else /* OPLUS_FEATURE_OEM_QMI */
-    group radio cache inet misc audio log readproc wakelock oem_2901 net_raw system root
-    #endif /* OPLUS_FEATURE_OEM_QMI */
+    group radio cache inet misc audio log readproc wakelock oem_2901
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
 
 service vendor.qcrild2 /vendor/bin/hw/qcrild -c 2
     class main
     user radio
     disabled
-    #ifdef OPLUS_FEATURE_OEM_QMI
-    #TanZhengpeng@NETWORK.REG.919197, 2016/06/04, modify for Oem qmi service
-    #group radio cache inet misc audio log readproc wakelock oem_2901
-    #else /* OPLUS_FEATURE_OEM_QMI */
-    group radio cache inet misc audio log readproc wakelock oem_2901 net_raw system root
-    #endif /* OPLUS_FEATURE_OEM_QMI */
+    group radio cache inet misc audio log readproc wakelock oem_2901
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
 
 service vendor.qcrild3 /vendor/bin/hw/qcrild -c 3
     class main
     user radio
     disabled
-    #ifdef OPLUS_FEATURE_OEM_QMI
-    #TanZhengpeng@NETWORK.REG.919197, 2016/06/04, modify for Oem qmi service
-    #group radio cache inet misc audio log readproc wakelock oem_2901
-    #else /* OPLUS_FEATURE_OEM_QMI */
-    group radio cache inet misc audio log readproc wakelock oem_2901 net_raw system root
-    #endif /* OPLUS_FEATURE_OEM_QMI */
-
+    group radio cache inet misc audio log readproc wakelock oem_2901
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
diff --git a/proprietary/vendor/etc/init/shsusrd.rc b/proprietary/vendor/etc/init/shsusrd.rc
index 7b1c60b..0242b65 100644
--- a/proprietary/vendor/etc/init/shsusrd.rc
+++ b/proprietary/vendor/etc/init/shsusrd.rc
@@ -1,10 +1,9 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
 
 on boot
-    # Create netmgr recovery folder
     write /data/vendor/shsusr/shsusr_log.txt ""
     chown radio radio /data/vendor/shsusr/shsusr_log.txt
 
@@ -18,6 +17,7 @@ service vendor.shsusrd /system/vendor/bin/shsusrd 0x002819000
     class main
     user radio
     group radio
+    capabilities NET_ADMIN
     disabled
 
 on property:persist.vendor.data.shsusr_load=1
@@ -25,3 +25,16 @@ on property:persist.vendor.data.shsusr_load=1
 
 on property:persist.vendor.data.shsusr_load=0
     stop vendor.shsusrd
+
+on property:persist.vendor.data.shsusr_ipa=02
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "02"
+
+on property:persist.vendor.data.shsusr_ipa=10
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "10"
+
+on property:persist.vendor.data.shsusr_ipa=20
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "20"
+
+on property:persist.vendor.data.shsusr_ipa=40
+    write /sys/class/net/rmnet_ipa0/queues/rx-0/rps_cpus "40"
+
diff --git a/proprietary/vendor/etc/init/ssgtzd.rc b/proprietary/vendor/etc/init/ssgtzd.rc
index 1db24c7..3d11b3c 100644
--- a/proprietary/vendor/etc/init/ssgtzd.rc
+++ b/proprietary/vendor/etc/init/ssgtzd.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# Copyright (c) 2019,2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 
@@ -7,8 +7,8 @@
 on post-fs-data
     mkdir /data/vendor/qwes 0755 system system
 
-# Start daemon after boot completed
-on property:sys.boot_completed=1
+# Start daemon on early-boot
+on early-boot
     start vendor.ssgtzd
 
 # Used 'disabled' flag, so daemon won't be started until explicit start
diff --git a/proprietary/vendor/etc/izat.conf b/proprietary/vendor/etc/izat.conf
index 5e509dd..8734134 100644
--- a/proprietary/vendor/etc/izat.conf
+++ b/proprietary/vendor/etc/izat.conf
@@ -107,7 +107,7 @@ GTP_WAA=DISABLED
 # PREMIUM
 # PREMIUM_ENV_AIDING
 # MODEM_DEFAULT
-SAP=PREMIUM
+SAP=MODEM_DEFAULT
 
 #FREE_WIFI_SCAN_INJECT valid modes:
 #DISABLED
@@ -124,6 +124,14 @@ SUPL_WIFI=BASIC
 #BASIC
 WIFI_SUPPLICANT_INFO=BASIC
 
+#DBH modes:
+#USE_ZPP_IN_DBH values:
+#0: for new Modem platform, time based tracking is supported during DBH in modem,
+#   AP side doesn't need to use ZPP to get best available position during DBH.
+#1: for old Modem platform, time based tracking is not supported during DBH in modem,
+#   AP side has to use ZPP to get bese available position during DBH for CPI injection.
+USE_ZPP_IN_DBH = 0
+
 #####################################
 # Location process launcher settings
 #####################################
@@ -174,46 +182,46 @@ WIFI_SUPPLICANT_INFO=BASIC
 #3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
 PROCESS_NAME=lowi-server
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps wifi inet oem_2901
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=0
 
 PROCESS_NAME=xtwifi-inet-agent
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xc03
 PLATFORMS=all
-SOC_IDS=all exclude 386 436
+SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=xtwifi-client
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=wifi inet gps system oem_2904
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xd03
 PLATFORMS=all
-SOC_IDS=all exclude 386 436
+SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
diff --git a/proprietary/vendor/etc/media_codecs.xml b/proprietary/vendor/etc/media_codecs.xml
index 00a921b..4072750 100644
--- a/proprietary/vendor/etc/media_codecs.xml
+++ b/proprietary/vendor/etc/media_codecs.xml
@@ -146,7 +146,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="64" max="979200" />
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
@@ -164,7 +163,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="quality" range="0-100" default="80" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
             <Limit name="performance-point-4096x2304" value="24" />
@@ -209,13 +207,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-2000000" />
             <Limit name="frame-rate" range="1-30" />
             <Limit name="concurrent-instances" max="3" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
-        <!-- Changzhi.Wei-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2211467, 2021/09/24, Add for avoid cts test fail ：-->
-        <!-- CtsVideoTestCases:android.video.cts.CodecEncoderPerformanceTest#  -->
-        <!-- testPerformanceOfHardwareVideoEncoders[16(OMX.qcom.video.decoder.avc_video/mp4v-es_OMX.qcom.video.encoder.mpeg4sw_1_2.5)] -->
-        <!--
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
              <Quirk name="requires-allocate-on-input-ports" />
              <Quirk name="requires-allocate-on-output-ports" />
@@ -226,10 +219,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
-        -->
     </Encoders>
     <Decoders>
        <!-- Video Hardware  -->
@@ -243,7 +236,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -260,7 +252,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="24" />
@@ -277,7 +268,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
@@ -291,7 +281,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-1920x1080" value="30" />
@@ -306,7 +295,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -323,7 +311,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="24" />
@@ -340,7 +327,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -357,7 +343,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="24" />
@@ -375,7 +360,6 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-16000000" />
              <Limit name="frame-rate" range="1-30" />
              <Feature name="adaptive-playback" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="concurrent-instances" max="4" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
@@ -389,7 +373,6 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-40000000" />
              <Limit name="frame-rate" range="1-30" />
              <Limit name="concurrent-instances" max="4" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
         <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
diff --git a/proprietary/vendor/etc/media_codecs_performance.xml b/proprietary/vendor/etc/media_codecs_performance.xml
index 23cbc20..1be041a 100644
--- a/proprietary/vendor/etc/media_codecs_performance.xml
+++ b/proprietary/vendor/etc/media_codecs_performance.xml
@@ -38,33 +38,14 @@ limitations under the License.
             <Limit name="measured-frame-rate-320x240" range="340-400" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
-        <!-- #ifndef OPLUS_BUG_COMPATIBILITY -->
-        <!-- ziran.deng-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2656952, 2021/12/1, -->
-        <!--
             <Limit name="measured-frame-rate-176x144" range="60-90" />
-        -->
-        <!-- #else //OPLUS_BUG_COMPATIBILITY -->
-            <Limit name="measured-frame-rate-176x144" range="150-350" />
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
-        <!-- #ifndef OPLUS_BUG_COMPATIBILITY -->
-        <!-- ziran.deng-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2802624, 2021/12/17, -->
-        <!--
             <Limit name="measured-frame-rate-352x288" range="55-85" />
-        -->
-        <!-- #else //OPLUS_BUG_COMPATIBILITY -->
-            <Limit name="measured-frame-rate-352x288" range="100-222" />
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
         </MediaCodec>
-        <!-- Changzhi.Wei-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2211467, 2021/09/24, Add for avoid cts test fail ：-->
-        <!-- CtsVideoTestCases:android.video.cts.CodecEncoderPerformanceTest#  -->
-        <!-- testPerformanceOfHardwareVideoEncoders[16(OMX.qcom.video.decoder.avc_video/mp4v-es_OMX.qcom.video.encoder.mpeg4sw_1_2.5)] -->
-        <!--
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="125-135" />
             <Limit name="measured-frame-rate-352x288" range="55-85" />
             <Limit name="measured-frame-rate-640x480" range="70-106" />
         </MediaCodec>
-        -->
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="339-486" />
             <Limit name="measured-frame-rate-640x360" range="203-291" />
@@ -113,39 +94,17 @@ limitations under the License.
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-
-        <!-- #ifndef OPLUS_BUG_COMPATIBILITY -->
-        <!-- ziran.deng-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2802624, 2021/12/17, -->
-        <!--
-            <Limit name="measured-frame-rate-320x240" range="480-510" />
+            <Limit name="measured-frame-rate-320x240" range="1140-1410" />
             <Limit name="measured-frame-rate-720x480" range="460-490" />
             <Limit name="measured-frame-rate-1280x720" range="350-400" />
             <Limit name="measured-frame-rate-1920x1088" range="180-190" />
-        -->
-        <!-- #else //OPLUS_BUG_COMPATIBILITY -->
-            <Limit name="measured-frame-rate-320x240" range="318-700" />
-            <Limit name="measured-frame-rate-720x480" range="222-490" />
-            <Limit name="measured-frame-rate-1280x720" range="182-400" />
-            <Limit name="measured-frame-rate-1920x1088" range="86-190" />
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
         </MediaCodec>
             <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-        <!-- #ifndef OPLUS_BUG_COMPATIBILITY -->
-        <!-- ziran.deng-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2802624, 2021/12/17, -->
-        <!--
-            <Limit name="measured-frame-rate-352x288" range="510-530" />
+            <Limit name="measured-frame-rate-352x288" range="1300-1640" />
             <Limit name="measured-frame-rate-720x480" range="465-620" />
             <Limit name="measured-frame-rate-1280x720" range="200-390" />
             <Limit name="measured-frame-rate-1920x1080" range="210-230" />
             <Limit name="measured-frame-rate-3840x2160" range="65-75" />
-        -->
-        <!-- #else //OPLUS_BUG_COMPATIBILITY -->
-            <Limit name="measured-frame-rate-352x288" range="377-830" />
-            <Limit name="measured-frame-rate-720x480" range="281-620" />
-            <Limit name="measured-frame-rate-1280x720" range="177-390" />
-            <Limit name="measured-frame-rate-1920x1080" range="104-230" />
-            <Limit name="measured-frame-rate-3840x2160" range="34-75" />
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
         </MediaCodec>
         <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="358-837" />
@@ -163,24 +122,12 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="248-248" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
-        <!-- #ifndef OPLUS_BUG_COMPATIBILITY -->
-        <!-- ziran.deng-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2802624, 2021/12/17, -->
-        <!--
-            <Limit name="measured-frame-rate-320x180" range="477-877" />
+            <Limit name="measured-frame-rate-320x180" range="1310-1570" />
             <Limit name="measured-frame-rate-320x240" range="377-377" />
             <Limit name="measured-frame-rate-640x360" range="486-751" />
             <Limit name="measured-frame-rate-1280x720" range="262-262" />
             <Limit name="measured-frame-rate-1920x1080" range="220-220" />
             <Limit name="measured-frame-rate-3840x2160" range="51-51" />
-        -->
-        <!-- #else //OPLUS_BUG_COMPATIBILITY -->
-            <Limit name="measured-frame-rate-320x180" range="398-877" />
-            <Limit name="measured-frame-rate-320x240" range="171-377" />
-            <Limit name="measured-frame-rate-640x360" range="341-751" />
-            <Limit name="measured-frame-rate-1280x720" range="119-262" />
-            <Limit name="measured-frame-rate-1920x1080" range="150-220" />
-            <Limit name="measured-frame-rate-3840x2160" range="23-51" />
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="270-310" />
@@ -225,7 +172,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="10-13" />
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="128-178" />
+            <Limit name="measured-frame-rate-352x288" range="400-630" />
             <Limit name="measured-frame-rate-640x360" range="84-96" />
             <Limit name="measured-frame-rate-720x480" range="165-205" />
             <Limit name="measured-frame-rate-1280x720" range="47-74" />
@@ -237,8 +184,8 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="374-542" />
-            <Limit name="measured-frame-rate-480x360" range="310-470" />
-            <Limit name="measured-frame-rate-1280x720" range="94-207" />
+            <Limit name="measured-frame-rate-480x360" range="500-700" />
+            <Limit name="measured-frame-rate-1280x720" range="300-400" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="310-690" />
@@ -247,14 +194,9 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="22-33" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="234-450" />
+            <Limit name="measured-frame-rate-320x180" range="1000-1110" />
             <Limit name="measured-frame-rate-640x360" range="203-330" />
-            <!-- #ifndef OPLUS_BUG_COMPATIBILITY-->
-            <!-- Yugang.Ma@MULTMEDIASERVER.PLAYER.1100417, 2021/02/09, Add for CTS test-->
-            <!--<Limit name="measured-frame-rate-1280x720" range="34-49" />-->
-            <!-- #else OPLUS_BUG_COMPATIBILITY-->
-            <Limit name="measured-frame-rate-1280x720" range="50-110" />
-            <!-- #endif OPLUS_BUG_COMPATIBILITY-->
+            <Limit name="measured-frame-rate-1280x720" range="145-175" />
             <Limit name="measured-frame-rate-1920x1080" range="20-31" />
         </MediaCodec>
     </Decoders>
diff --git a/proprietary/vendor/etc/media_codecs_vendor.xml b/proprietary/vendor/etc/media_codecs_vendor.xml
index 10a364d..20ec969 100644
--- a/proprietary/vendor/etc/media_codecs_vendor.xml
+++ b/proprietary/vendor/etc/media_codecs_vendor.xml
@@ -230,10 +230,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
-        <!-- Changzhi.Wei-xinzhi@MULTIMEDIA.MEDIASERVER.PLAYER.2211467, 2021/09/24, Add for avoid cts test fail ：-->
-        <!-- CtsVideoTestCases:android.video.cts.CodecEncoderPerformanceTest#  -->
-        <!-- testPerformanceOfHardwareVideoEncoders[16(OMX.qcom.video.decoder.avc_video/mp4v-es_OMX.qcom.video.encoder.mpeg4sw_1_2.5)] -->
-        <!--
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
              <Quirk name="requires-allocate-on-input-ports" />
              <Quirk name="requires-allocate-on-output-ports" />
@@ -244,10 +240,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
-        -->
     </Encoders>
     <Decoders>
        <!-- Video Hardware  -->
diff --git a/proprietary/vendor/etc/media_codecs_vendor_audio.xml b/proprietary/vendor/etc/media_codecs_vendor_audio.xml
index 338624a..2749bc6 100644
--- a/proprietary/vendor/etc/media_codecs_vendor_audio.xml
+++ b/proprietary/vendor/etc/media_codecs_vendor_audio.xml
@@ -18,11 +18,6 @@
 <Included>
     <Decoders>
         <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
-        <!-- #ifdef OPLUS_BUG_COMPATIBILITY -->
-        <!-- Wuhan@MULTIMEDIA.MEDIASERVER.PLAYER.233011, 2020/09/03, -->
-        <!-- add for using OMX decoder for audio/raw since c2 decoder doesn't support 24/32 bit -->
-        <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" update="true" rank="1"/>
-        <!-- #endif //OPLUS_BUG_COMPATIBILITY -->
         <!-- SimpleOMXComponet based software decoder-->
     </Decoders>
 </Included>
diff --git a/proprietary/vendor/etc/media_profiles_vendor.xml b/proprietary/vendor/etc/media_profiles_vendor.xml
index a9e85ba..371305a 100644
--- a/proprietary/vendor/etc/media_profiles_vendor.xml
+++ b/proprietary/vendor/etc/media_profiles_vendor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2019, 2021 The Linux Foundation. All rights reserved.
      Not a contribution.
      Copyright (C) 2010 The Android Open Source Project
 
@@ -93,7 +93,7 @@
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <!-- Back Camera -->
-    <CamcorderProfiles cameraId="0" startOffsetMs="400" >
+    <CamcorderProfiles cameraId="0">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -180,56 +180,13 @@
              height="1080"
              frameRate="30" />
 
-<!-- wangbuqing@media ,20191219 ,[ITN-11823] change aac encoder maxBitRate from 156000 to 192000 -->
       <Audio codec="aac"
-             bitRate="192000"
+             bitRate="156000"
              sampleRate="48000"
              channels="2" />
     </EncoderProfile>
 
-    <!--khursheed.ali@imaging, 2020/03/19, HFR for Rear Main camera-->
-    <!-- VENDOR_EDIT add start -->
-    <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="42000000"
-             width="1920"
-             height="1080"
-             frameRate="240" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
-   <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="42000000"
-             width="1920"
-             height="1080"
-             frameRate="240" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="42000000"
-             width="1920"
-             height="1080"
-             frameRate="240" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-    <!-- VENDOR_EDIT add end -->
-
-    <!--<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -240,7 +197,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>-->
+    </EncoderProfile>
 
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -408,7 +365,7 @@
              channels="2" />
     </EncoderProfile>
 
-   <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+    <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -419,7 +376,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>-->
+    </EncoderProfile>
 
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -441,7 +398,7 @@
 
     </CamcorderProfiles>
     <!-- Front Camera -->
-    <CamcorderProfiles cameraId="1" startOffsetMs="400" >
+    <CamcorderProfiles cameraId="1">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -457,18 +414,11 @@
     </EncoderProfile>
 
     <EncoderProfile quality="high" fileFormat="mp4" duration="30">
-      <!-- Vendor Edit start -->
       <Video codec="h264"
-             bitRate="20000000"
-             width="1920"
-             height="1080"
-             frameRate="30" />
-      <!--<Video codec="h264"
              bitRate="42000000"
              width="3840"
              height="2160"
-             frameRate="30" />-->
-      <!-- Vendor Edit end -->
+             frameRate="30" />
 
       <Audio codec="aac"
              bitRate="156000"
@@ -541,8 +491,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <!-- Vendor Edit start -->
-    <!--<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -563,8 +512,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>-->
-    <!-- Vendor Edit end -->
+    </EncoderProfile>
     <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
       <Video codec="h264"
              bitRate="192000"
@@ -763,6 +711,19 @@
              channels="1" />
     </EncoderProfile>
 
+    <EncoderProfile quality="high" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="42000000"
+             width="2560"
+             height="1440"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
       <Video codec="h264"
              bitRate="512000"
@@ -868,6 +829,20 @@
              channels="1" />
     </EncoderProfile>
 
+    <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="42000000"
+             width="2560"
+             height="1440"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="192000"
@@ -1932,9 +1907,8 @@
         maxHFRFrameWidth="0" maxHFRFrameHeight="0"
         maxHFRMode="0"  />
 
-<!-- wangbuqing@media ,20191219 ,[ITN-11823] change aac encoder maxBitRate from 96000 to 192000 -->
     <AudioEncoderCap name="aac" enabled="true"
-        minBitRate="8000" maxBitRate="192000"
+        minBitRate="8000" maxBitRate="96000"
         minSampleRate="8000" maxSampleRate="48000"
         minChannels="1" maxChannels="6" />
 
diff --git a/proprietary/vendor/etc/perf/commonresourceconfigs.xml b/proprietary/vendor/etc/perf/commonresourceconfigs.xml
index 8cc322f..3f40225 100644
--- a/proprietary/vendor/etc/perf/commonresourceconfigs.xml
+++ b/proprietary/vendor/etc/perf/commonresourceconfigs.xml
@@ -114,6 +114,7 @@ need to be added just before the end of it's major group. -->
         <Minor OpcodeValue="0x39" Node="/dev/stune/top-app/schedtune.colocate" Supported="no" />
         <Minor OpcodeValue="0x3A" Node="/dev/cpuctl/top-app/cpu.uclamp.latency_sensitive" />
         <Minor OpcodeValue="0x3B" Node="/dev/cpuctl/foreground/cpu.uclamp.latency_sensitive" />
+        <Minor OpcodeValue="0x3D" Node="/proc/sys/kernel/%s" Supported="no"/>
     <!-- sched major end -->
 
     <!-- core hotplug major start -->
@@ -248,7 +249,7 @@ need to be added just before the end of it's major group. -->
         <Minor OpcodeValue="0xE" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/idle_mbps" />
         <Minor OpcodeValue="0xF" Node="/sys/devices/system/cpu/bus_dcvs/DDR/19091000.qcom,bwmon-ddr/min_freq" />
         <Minor OpcodeValue="0x10" Node="/sys/devices/system/cpu/bus_dcvs/DDR/19091000.qcom,bwmon-ddr/max_freq" />
-
+        <Minor OpcodeValue="0x11" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/use_ab" />
 
     <!-- llcbw hwmon major end -->
 
diff --git a/proprietary/vendor/etc/perf/perfboostsconfig.xml b/proprietary/vendor/etc/perf/perfboostsconfig.xml
index ec4684c..fd0f8e0 100644
--- a/proprietary/vendor/etc/perf/perfboostsconfig.xml
+++ b/proprietary/vendor/etc/perf/perfboostsconfig.xml
@@ -31,7 +31,7 @@
         <!-- Type="1", main launch boost of 2sec -->
        <Config
            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="lito"
-           Resources="0x40C20000, 0x41, 0x40C1C000, 0x47, 0x40C20200, 0x55, 0x40C1C200, 0x5F,
+           Resources="0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40C20200, 0x28, 0x40C1C200, 0x32,
                       0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF, 0x40800000, 1478,
                       0x40800100, 1363, 0x40800200, 1708" />
 
@@ -180,7 +180,7 @@
         <!-- Type="1", Vertical Scroll boost -->
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="lito" Fps="60"
-            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094,
+            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1075, 0x40800200, 1094,
                        0x40C00000, 2" />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
@@ -193,7 +193,7 @@
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="lito" Fps="90"
-            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094,
+            Resources="0x43010000, 0x26, 0x40800000, 1728, 0x40800100, 1363, 0x40800200, 1766,
                        0x40C00000, 2, 0x40C74000, 0xC0, 0x40408000, 0x27" />
 
         <Config
@@ -247,7 +247,7 @@
         <!-- Type="2", Horizontal Scroll boost -->
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="lito" Fps="60"
-            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094,
+            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1075, 0x40800200, 1094,
                        0x40C00000, 2" />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
@@ -260,7 +260,7 @@
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="lito" Fps="90"
-            Resources="0x43010000, 0x26, 0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094,
+            Resources="0x43010000, 0x26, 0x40800000, 1728, 0x40800100, 1363, 0x40800200, 1766,
                        0x40C00000, 2, 0x40C74000, 0xC0, 0x40408000, 0x27" />
 
         <Config
@@ -383,7 +383,7 @@
 
         <!-- Type="", MTP boost -->
         <Config
-            Id="0x00001086" Enable="false" Target="lito"
+            Id="0x00001086" Enable="true" Target="lito"
             Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
                        0x40800000, 1478, 0x40800100, 1363, 0x40800200, 1708, 0x42C10000, 0x1" />
 
@@ -411,12 +411,11 @@
         <!-- SCHEDBOOST resource opcode, value-->
         <!-- SCHED_FORCE_LB_ENABLE opcode, value-->
         <!-- Type="", Package Install boost -->
-        <!-- remove package install boost
         <Config
             Id="0x00001088" Enable="true" Target="lito"
             Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100, 0xFFF, 0x40800200, 0xFFF, 0x40CA0000, 0, 0x40C00000, 2" />
-        -->
+                       0x40800100, 0xFFF, 0x40800200, 0xFFF, 0x40CA0000, 0, 0x40C00000, 2,
+                       0x40CCC000, 0" />
 
         <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
         <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
@@ -476,7 +475,7 @@
          <!-- Type="1", Drag boost -->
          <Config
              Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="lito"
-             Resources="0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094" />
+             Resources="0x40800000, 1094, 0x40800100, 1075, 0x40800200, 1094" />
 
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
         <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
@@ -484,11 +483,11 @@
         <!-- SCHEDBOOST resource opcode, value-->
          <Config
              Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="lito" Fps="120"
-             Resources="0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094, 0x40C00000, 2" />
+             Resources="0x40800000, 1094, 0x40800100, 1075, 0x40800200, 1094, 0x40C00000, 2" />
 
          <Config
              Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="lito" Fps="144"
-             Resources="0x40800000, 1094, 0x40800100, 1100, 0x40800200, 1094, 0x40C00000, 2" />
+             Resources="0x40800000, 1094, 0x40800100, 1075, 0x40800200, 1094, 0x40C00000, 2" />
 
 
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -512,21 +511,21 @@
     <!--Display on Resource -->
          <!-- Display on resource opcode, value -->
          <Config
-                 Id="0x00001041" Enable="false" Timeout="0" Target="lito"
+                 Id="0x00001041" Enable="true" Timeout="0" Target="lito"
                  Resources="0x40000000, 1" />
 
         <Config
-                Id="0x00001041" Enable="false" Timeout="0" Target="lagoon"
+                Id="0x00001041" Enable="true" Timeout="0" Target="lagoon"
                 Resources="0x40000000, 1" />
 
     <!--Display off Resource -->
          <!-- Display on resource opcode, value -->
          <Config
-                 Id="0x00001040" Enable="false" Timeout="0" Target="lito"
+                 Id="0x00001040" Enable="true" Timeout="0" Target="lito"
                  Resources="0x40000000, 0x0" />
 
          <Config
-                Id="0x00001040" Enable="false" Timeout="0" Target="lagoon"
+                Id="0x00001040" Enable="true" Timeout="0" Target="lagoon"
                 Resources="0x40000000, 0x0" />
 
     <!--FPS Update Resource-->
@@ -587,5 +586,28 @@
                            0x40C68000, 0, 0x40C68010, 0, 0x40CC8000, 119,
                            0x40C8C000, 100000000" />
 
+         <!-- PREDECITIVE_LOAD BIG CORE resource opcode, value -->
+         <!-- PREDECITIVE_LOAD LITTLE Core resource opcode, value -->
+         <!-- SCHED_PREFER_SPREAD resource opcode, value -->
+         <!-- SLB_BIG_0, val-->
+         <!-- SLB_PRIME, val-->
+         <!-- WALT_RTG_CFS_BOOST_PRIO resource opcode, value -->
+         <!-- SCHED_COLOC_DOWNMIGRATE_NS resource opcode, value -->
+         <!-- SCHED_WINDOW_TICKS_UPDATE resource opcode, value -->
+         <!-- Type="144" -->
+         <Config
+                Id="0x00001094" Type="144" Enable="true" Target="lito" Timeout="0"
+                Resources="0x41444000, 1, 0x41444100, 1, 0x40CA8000, 2,
+                           0x40C68000, 0, 0x40C68200, 0, 0x40CC8000, 119,
+                           0x40C8C000, 100000000, 0x40CA4000, 2" />
+
+         <!--Large Comp HInt -->
+         <!-- CPU min freq resource opcode, value -->
+         <!-- GPU MIN_FREQUENCY resource opcode,value -->
+         <!-- PID Affine opcode,value -->
+         <Config
+                Id="0x00001097" Type="0" Enable="true" Timeout="7" Target="lito" Fps="144"
+                Resources="0x40800000, 1500, 0x42804000, 0, 0x42C20000, 1" />
+
     </PerfBoost>
 </BoostConfigs>
diff --git a/proprietary/vendor/etc/perf/perfconfigstore.xml b/proprietary/vendor/etc/perf/perfconfigstore.xml
index 807c91e..d9f94a2 100644
--- a/proprietary/vendor/etc/perf/perfconfigstore.xml
+++ b/proprietary/vendor/etc/perf/perfconfigstore.xml
@@ -33,7 +33,7 @@ ________________________________________________________________________________
 
                 <!--Vendor Properties -->
                 <Prop Name="vendor.debug.enable.lm" Value="true" />
-                <Prop Name="vendor.iop.enable_uxe" Value="0" />
+                <Prop Name="vendor.iop.enable_uxe" Value="1" />
                 <Prop Name="vendor.enable.prefetch" Value="false" />
                 <Prop Name="vendor.iop.enable_prefetch_ofr" Value="0" />
                 <Prop Name="vendor.perf.iop_v3.enable" Value="false" />
@@ -64,16 +64,8 @@ ________________________________________________________________________________
                 <Prop Name="ro.lmk.direct_reclaim_pressure" Value="45" />
                 <Prop Name="ro.lmk.reclaim_scan_threshold" Value="0" />
                 <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
-                <!--#ifndef  OPLUS_FEATURE_PERFORMANCE-->
-                <!--MoSiTing@ANDROID.PERFORMANCE, 2020/07/09, Modify for Increase cached app limit -->
-                <!--Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" /-->
-                <!--#else-->
-                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="128" />
-                <!--#endif /* OPLUS_FEATURE_PERFORMANCE */ -->
+                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" />
                 <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
-                <!--#ifdef VENDOR_EDIT-->
-                <!--#chenxinfu@PSW.AD.Performance.na, 2020/07/09, Add bind the wlc to litti cores -->
-                <Prop Name="ro.vendor.qti.set_wlc_affinity" Value="true" />
-                <!--#endif -->
+
     </PerfConfigs>
 </PerfConfigsStore>
diff --git a/proprietary/vendor/etc/powerhint.xml b/proprietary/vendor/etc/powerhint.xml
index b47ee07..450e8c7 100644
--- a/proprietary/vendor/etc/powerhint.xml
+++ b/proprietary/vendor/etc/powerhint.xml
@@ -43,11 +43,35 @@
         <!--L CPU - Set hispeed load 95 -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <!--CPU CORE 0 Min freq to 864 Mhz -->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4143C100, 0x360, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 864"/>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CPU - Set hispeed load 95 -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample_ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA,
+            0x43034000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera 60 FPS -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -62,7 +86,28 @@
             Id="0x00001332" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x4182C000, 0,
+            0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -77,7 +122,28 @@
             Id="0x00001333" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x4182C000, 0,
+            0x41000100, 6, 0x41808000, 100"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -88,12 +154,35 @@
         <!--L CPU CORE 5 SCHED LOAD BOOST -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
-        <!--CPU CORE 0 Min freq to 1.075Ghz -->
+        <!--CPU CORE 0 Min freq to 1.363Ghz -->
+        <!--Sched_prefer_spread to 1 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x40C20200, 0x14, 0x40C1C200, 0x1E,
-            0x41000100, 0x6, 0x42C10000, 0x1, 0x43010000, 59, 0x41828000, 806, 0x43400000, 0xFFFF,
-            0x40800000, 1516, 0x40800100, 1900, 0x40800200, 1996, 0x40CA8000, 0x2"/>
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x553, 0x40CA8000, 1"/>
+
+        <!-- HFR 480fps -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU CORE 0 Min freq to 1.2Ghz -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x40800100, 0x4B9,
+            0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- same settings for all the qvr power levels intentionally -->
         <!-- qvr level cpu1 gpu1 -->
@@ -113,6 +202,21 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu1 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -130,6 +234,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu1 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -147,6 +265,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu1 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -164,6 +296,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -181,6 +327,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -198,6 +358,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu1 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -215,6 +389,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -232,6 +420,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -249,6 +451,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
          <!-- sustained performance -->
          <!-- Prime CPU - Cluster min freq uncapped -->
          <!-- B CPU - Cluster min freq uncapped -->
@@ -265,6 +481,19 @@
              0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x113, 0X42810000, 0x190,
              0x42814000, 0x0"/>
 
+         <!-- sustained performance -->
+         <!-- B CPU - Cluster min freq uncapped -->
+         <!-- L CPU - Cluster min freq uncapped -->
+         <!-- B CPU - Cluster max freq ~1.248 GHz -->
+         <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+         <!-- GPU - min freq 253Mhz -->
+         <!-- GPU - max freq 355Mhz -->
+         <!-- GPUBW freq uncapped -->
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4E0, 0x40804100, 0x4E0,
+             0X4280C000, 0xFD, 0X42810000, 0x163, 0x42814000, 0x0"/>
+
          <!-- vr mode -->
          <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
          <!-- B CPU - Cluster min freq ~1.152 Ghz -->
@@ -281,6 +510,19 @@
              0x40804000, 0x76C, 0x40804100, 0x673, 0X4280C000, 0x113, 0X4280C000, 0x271,
              0x42814000, 0x0"/>
 
+         <!-- vr mode -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.017 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.90 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.708 Ghz -->
+         <!-- GPU - min freq 253Mhz -->
+         <!-- GPU - max freq 565Mhz -->
+         <!-- GPUBW uncapped -->
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x3F9, 0x40804000, 0x76C, 0x40804100, 0x6AB,
+             0X4280C000, 0xFD, 0X4280C000, 0x235, 0x42814000, 0x0"/>
+
          <!-- vr mode sustained performance -->
          <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
          <!-- B CPU - Cluster min freq ~1.152 Ghz -->
@@ -297,221 +539,18 @@
              0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x190, 0X42810000, 0x190,
              0x42814000, 0x0"/>
 
-        <!-- Rear Cam 4K 30 Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_REAR_UHD_30 -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 29 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <Config
-            Id="0x00001336" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Rear Cam FHD 60 Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_REAR_FHD_60 -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 38 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 91 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1036 -->
-        <!-- gold cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000) : 1056 -->
-        <!-- Sched downmigrate : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000) : 20 -->
-        <!-- Sched upmigrate : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000) : 30 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x00001335"  Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Rear Cam 4K 60 Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_REAR_UHD_60 -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 38 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 91 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1305 -->
-        <!-- gold cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000) : 1171 -->
-        <!-- Sched downmigrate : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000) : 20 -->
-        <!-- Sched upmigrate : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000) : 30 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x00001337" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Front Cam Preview -->
-        <!-- Hint - POWER_HINT_ID_FRONT_PREVIEW -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 25 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x00001338" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Rear Cam FHD 30 Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_REAR_FHD_30 -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 29 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <Config
-            Id="0x00001339" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Rear Cam Bokeh Preview -->
-        <!-- Hint - POWER_HINT_ID_REAR_BOKEH_PREVIEW -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 25 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x0000133A" Enable="true" Timeout="0" Target="lito"
-            Resources="0x43008000, 0, 0x4300C000, 0xA, 0x43000000, 29, 0x4180C000, 0, 0x41820000, 0xA, 0x41800000, 71,
-            0x41808000, 80, 0x40800100, 1100, 0x40800000, 1100,0x43024000, 0, 0x43034000,0x14,0x41838000 ,0,0x4183C000 ,0x14"/>
-
-        <!-- Front Cam Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_FRONT_ENCODE -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 29 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <Config
-            Id="0x0000133B" Enable="true" Timeout="0" Target="lito"
-            Resources="0x41444100, 0, 0x41440100, 0x63, 0x41444000, 0, 0x43008000, 0, 0x4300C000, 0xA,
-            0x43000000, 29, 0x4180C000, 0, 0x41820000, 0xA, 0x41800000, 71, 0x40800100,1200, 0x40800000, 1200, 0x43818000, 1, 0x4381C000, 1"/>
-
-        <!-- Rear Cam Preview -->
-        <!-- Hint - POWER_HINT_ID_REAR_PREVIEW -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 25 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x0000133C" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- UltraWide SuperSteady 4K Encoding -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 38 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 91 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1305 -->
-        <!-- gold cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000) : 1171 -->
-        <!-- Sched downmigrate : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000) : 10 -->
-        <!-- Sched upmigrate : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000) : 20 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x0000133E" Enable="true" Timeout="0" Target="lito"
-            Resources="0x43008000, 0, 0x4300C000, 0xA, 0x43000000, 38, 0x4180C000, 0, 0x41820000, 0xA, 0x41800000, 91,
-            0x40800100, 1305, 0x40800000, 1171, 0x40C20000, 10, 0x40C1C000, 20, 0x41808000, 80"/>
-
-        <!-- camera cts -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_ENCODE_CTS -->
-        <!--L CPU CORE 0 SCHED LOAD BOOST -->
-        <!--L CPU CORE 1 SCHED LOAD BOOST -->
-        <!--L CPU CORE 2 SCHED LOAD BOOST -->
-        <!--L CPU CORE 3 SCHED LOAD BOOST -->
-        <!--L CPU - Disable schedutil PL -->
-        <!--L CPU - Set hispeed load 99 -->
-        <!--B CPU - Disable schedutil PL -->
-        <!--LLC-DDR BWMON - Set sample_ms 10 -->
-        <!--CPU-LLC BWMON - Set sample_ms 10 -->
-        <!--LLC-DDR BWMON - Set io_percent 100 -->
-        <!--CPU-LLC BWMON - Set io_percent 100 -->
-        <!--CPU-LLC BWMON - Set hyst_length 0 -->
-        <!--LLC-DDR BWMON - Set hyst_length 0 -->
-        <!--CPU0-LLC MEM LAT - Set ratio_ceil 100 -->
-        <Config
-            Id="0x0000133F" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-        <!-- camera thirdparty -->
-        <!-- Hint - POWER_HINT_ID_THIRD_PARTY_CAM -->
-        <!--L CPU CORE 0 SCHED LOAD BOOST -->
-        <!--L CPU CORE 1 SCHED LOAD BOOST -->
-        <!--L CPU CORE 2 SCHED LOAD BOOST -->
-        <!--L CPU CORE 3 SCHED LOAD BOOST -->
-        <!--L CPU - Disable schedutil PL -->
-        <!--L CPU - Set hispeed load 99 -->
-        <!--B CPU - Disable schedutil PL -->
-        <!--LLC-DDR BWMON - Set sample_ms 10 -->
-        <!--CPU-LLC BWMON - Set sample_ms 10 -->
-        <!--LLC-DDR BWMON - Set io_percent 100 -->
-        <!--CPU-LLC BWMON - Set io_percent 100 -->
-        <!--CPU-LLC BWMON - Set hyst_length 0 -->
-        <!--LLC-DDR BWMON - Set hyst_length 0 -->
-        <!--CPU0-LLC MEM LAT - Set ratio_ceil 100 -->
-        <Config
-            Id="0x00001340" Enable="true" Timeout="0" Target="lito"
-            Resources="0x43008000, 0, 0x4300C000, 0xA, 0x43000000, 29, 0x4180C000, 0, 0x41820000, 0xA, 0x41800000, 71, 0x40800100, 1420"/>
-
-        <!-- Rear Cam SAT Encoding -->
-        <!-- Hint - POWER_HINT_ID_VIDEO_SAT -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 29 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <Config
-            Id="0x00001341" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <!-- Rear Cam 48M Preview -->
-        <!-- Hint - POWER_HINT_ID_48M_PREVIEW -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000) : 0x00(0) -->
-        <!-- llcc-ddr-bw sample_ms : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000) : 0x0A(10) -->
-        <!-- llcc-ddr-bw min_freq : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000) : 25 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000) : 0x00(0) -->
-        <!-- cpu-llcc-bw sample_ms : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000) : 0x0A(10) -->
-        <!-- cpu-llcc-bw min_freq : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000) : 71 -->
-        <!-- cpu-llcc-bw io_percent : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80 -->
-        <Config
-            Id="0x00001342" Enable="true" Timeout="0" Target="lito"
-            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
-
-        <Config
-            Id="0x00001343" Enable="true" Timeout="0" Target="lito"
-            Resources="0x43008000, 0, 0x4300C000, 0xA, 0x43000000, 29, 0x4180C000, 0, 0x41820000, 0xA, 0x41800000, 71,
-            0x41808000, 80, 0x40800100, 1400"/>
-
+         <!-- vr mode sustained performance -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 355Mhz -->
+         <!-- GPU - max freq 355Mhz -->
+         <!-- GPUBW uncapped  -->
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x4CC, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x163, 0X42810000, 0x163, 0x42814000, 0x0"/>
     </Powerhint>
 </HintConfigs>
 
diff --git a/proprietary/vendor/etc/public.libraries.txt b/proprietary/vendor/etc/public.libraries.txt
index ce929dc..fc87714 100644
--- a/proprietary/vendor/etc/public.libraries.txt
+++ b/proprietary/vendor/etc/public.libraries.txt
@@ -7,17 +7,3 @@ libsdsprpc.so
 libfastcvopt.so
 liblistensoundmodel2.so
 libOpenCL.so
-libnpu.so
-libhta_hexagon_runtime.so
-unnhal-acc-hta.so
-libAlgoProcess.so
-libancbase_rt_bokeh.so
-libAncHumBokeh.so
-libsnpe_loader.so
-libstblur_api.so
-libAncHumVideoBase.so
-libmidasserviceintf.so
-libAncFilter.so
-libarcsoft_scbokeh_video.so
-libAncHumanDoubleExposure.so
-libancbase_rt_doubleexposure.so
diff --git a/proprietary/vendor/etc/seccomp_policy/imsrtp.policy b/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
index 3ed54f6..38dc4c9 100644
--- a/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
+++ b/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
@@ -92,4 +92,4 @@ sched_getaffinity: 1
 socket: 1
 process_vm_readv: 1
 tgkill: 1
-
+sigreturn: 1
diff --git a/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy b/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
index 1100707..5c48147 100644
--- a/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
+++ b/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc
 #
@@ -64,4 +64,5 @@ getpid: 1
 sigaltstack: 1
 setpriority: 1
 getdents64: 1
-dup: 1
\ No newline at end of file
+dup: 1
+mremap:1
diff --git a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
index 5bb6994..35ceb63 100644
--- a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
+++ b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2020, 2022 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc
 #
@@ -92,3 +92,4 @@ tgkill: 1
 gettid: 1
 sched_yield: 1
 flock: 1
+getdents64: 1
diff --git a/proprietary/vendor/etc/ssg/ta_config.json b/proprietary/vendor/etc/ssg/ta_config.json
index 9337adb..54b74b4 100644
--- a/proprietary/vendor/etc/ssg/ta_config.json
+++ b/proprietary/vendor/etc/ssg/ta_config.json
@@ -14,7 +14,6 @@ Confidential and Proprietary - Qualcomm Technologies, Inc.
     { "path":"/vendor/firmware_mnt/image/haventkn.mbn"},
     { "path":"/vendor/firmware/image/haventkn.mbn"},
     { "path":"/vendor/firmware_mnt/image/tzsc.mbn"},
-    { "path":"/vendor/firmware_mnt/image/rtice.mbn"},
-    { "path":"/vendor/firmware_mnt/image/rtic.mbn"}
+    { "path":"/vendor/firmware_mnt/image/rtice.mbn"}
   ]
 }
diff --git a/proprietary/vendor/etc/system_properties.xml b/proprietary/vendor/etc/system_properties.xml
index 2374d56..b8f0db0 100644
--- a/proprietary/vendor/etc/system_properties.xml
+++ b/proprietary/vendor/etc/system_properties.xml
@@ -42,9 +42,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <!-- Bitmask for arb mode: 1: AVC, 2: HEVC, 4: MPEG2 -->
         <property name="vidc_dec_arb_mode_override" value="7"/>
         <property name="vidc_enc_quality_boost_enable" value="1"/>
-        <!-- #ifdef OPLUS_BUG_COMPATIBILITY -->
-        <!-- Yugang.Ma@MULTIMEDIA.MEDIASERVER.PLAYER.964758, 2021/1/16, add for disable CAC-->
-        <!-- Enable CAC control: 0x0: disabled, 0x1:enabled for 8 bit, 0x2:enabled for 10 bit, 0x3:enabled for 8 and 10 bits both -->
-        <property name="vidc_enc_bitrate_savings_enable" value="0"/>
-        <!-- #endif OPLUS_BUG_COMPATIBILITY-->
 </configs>
diff --git a/proprietary/vendor/etc/thermal-engine.conf b/proprietary/vendor/etc/thermal-engine.conf
deleted file mode 100644
index 33fc821..0000000
--- a/proprietary/vendor/etc/thermal-engine.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# File empty by default.
-# Replace contents of this file with custom configuration.
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_oplus_vpp.xml b/proprietary/vendor/etc/vintf/manifest/manifest_oplus_vpp.xml
deleted file mode 100644
index eb87603..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_oplus_vpp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal>
-        <name>vendor.qti.hardware.vpp</name>
-        <transport>hwbinder</transport>
-        <version>1.3</version>
-        <interface>
-            <name>IHidlVppService</name>
-            <instance>vppService</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/etc/wfdconfig.xml b/proprietary/vendor/etc/wfdconfig.xml
index d9a515c..46450c2 100644
--- a/proprietary/vendor/etc/wfdconfig.xml
+++ b/proprietary/vendor/etc/wfdconfig.xml
@@ -160,12 +160,12 @@
 
         <!--  disable HDCP by default -->
         <ContentProtection>
-            <Valid>1</Valid>
+            <Valid>0</Valid>
             <!--
                 Valid values WFD_HDCP_2_0,
                 WFD_HDCP_2_1 and WFD_HDCP_2_2
             -->
-            <Version>WFD_HDCP_2_3</Version>
+            <Version>WFD_HDCP_2_2</Version>
             <CPPort>6789</CPPort>
             <!--
                 turn on/off audio encryption
@@ -704,12 +704,7 @@
         To disable/enable audio stream playback
         support during power suspend - 0 or 1
     -->
-
-    <!-- #ifdef OPLUS_BUG_STABILITY -->
-    <!-- Liang.Xu@PSW.MM.AudioServer.Base.1297775, 2018/12/12, -->
-    <!-- Modify for audio should still playing on TV after screen off -->
-    <AudioStreamInSuspend>1</AudioStreamInSuspend>
-    <!-- #endif //OPLUS_BUG_STABILITY -->
+    <AudioStreamInSuspend>0</AudioStreamInSuspend>
 
     <!--
         Compensation delay for audio
diff --git a/proprietary/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini b/proprietary/vendor/etc/wifi/WCNSS_qcom_cfg.ini
similarity index 88%
rename from proprietary/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini
rename to proprietary/vendor/etc/wifi/WCNSS_qcom_cfg.ini
index bbf6d7c..8ed786a 100644
--- a/proprietary/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini
+++ b/proprietary/vendor/etc/wifi/WCNSS_qcom_cfg.ini
@@ -1,4 +1,4 @@
-#OplusVersion=2022030413
+#OplusVersion=2020062814
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
@@ -56,7 +56,7 @@ gEnableApOBSSProt=0
 #ifdef OPLUS_BUG_STABILITY
 #Min.Yi@CONNECTIVITY.WiFi.Hardware.Power.1323750, 2018/03/21
 #Add for high current when download on 11B
-#g11bNumTxChains=1
+g11bNumTxChains=1
 #endif /* OPLUS_BUG_STABILITY */
 
 #ifdef OPLUS_BUG_STABILITY
@@ -139,12 +139,6 @@ FastRoamEnabled=1
 RoamRssiDiff=8
 #endif /* OPLUS_BUG_STABILITY */
 
-#ifndef OPLUS_BUG_STABILITY
-#LuoChuang@CONNECTIVITY.WIFI.CONNECTION.CONNECT.579908, 2020/12/01
-#Disable HIRSSI roaming
-gRoamScanHiRssiDelta=0
-#endif /* OPLUS_BUG_STABILITY */
-
 #ifdef OPLUS_BUG_STABILITY
 #Botao.Cu@CONNECTIVITY.WiFi.Connect.select.1064666, 2017/01/04,
 #add for select 5G wifi preferentially
@@ -161,24 +155,7 @@ roam_bad_rssi_thresh_offset_2g=0
 gtraffic_threshold=55
 groam_dense_rssi_thresh_offset=0
 
-#ifndef OPLUS_BUG_STABILITY
-#LiJunlong@CONNECTIVITY.WIFI.NETWORK.295941.2020/09/01,Modify for ini file update
-#gNeighborLookupThreshold=80
-#else /* OPLUS_BUG_STABILITY */
-gNeighborLookupThreshold=78
-#endif /* OPLUS_BUG_STABILITY */
-
-#ifdef OPLUS_BUG_STABILITY
-#LiJunlong@CONNECTIVITY.WIFI.NETWORK.295941.2020/09/01,Add for ini file update
-global_adapt_dwelltime_mode = 1
-#endif /* OPLUS_BUG_STABILITY */
-
-#ifndef OPLUS_BUG_COMPATIBILITY
-#FanBingqi@CONNECTIVITY.WIFI.CONNECTION.4506, 2020/08/12,
-#Add for Qpower parameter,0=disable,1=enable
-gOptimizedPowerManagement=1
-#endif /* OPLUS_BUG_COMPATIBILITY */
-
+gNeighborLookupThreshold=80
 #add for roam scan diff
 gRoamRescanRssiDiff=3
 #add for disable background scan roam
@@ -280,13 +257,7 @@ gEnableMCCMode=1
 # 3-Force SCC if same band, without SAP restart by sending (E)CSA
 # 4-Force SCC if same band (or) use SAP mandatory channel for DBS,
 #   without SAP restart by sending (E)CSA
-#ifdef OPLUS_BUG_STABILITY
-#JiaoBo@CONNECTIVITY.WIFI.BASIC.SOFTAP.2138454, 2019/07/04,
-#remove for: support mcc mode in scene opening 2.4g hotspot when wifi connect to 5g.
-#gWlanMccToSccSwitchMode = 3
-#else
-gWlanMccToSccSwitchMode = 6
-#endif /* OPLUS_BUG_STABILITY */
+gWlanMccToSccSwitchMode = 3
 
 # 1=enable STBC; 0=disable STBC
 gEnableRXSTBC=1
@@ -424,19 +395,6 @@ gSapSccChanAvoidance=0
 # Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
 gIbssTxSpEndInactivityTime=10
 
-# Enable support for TDLS
-#  0 - disable
-#  1 - enable
-gEnableTDLSSupport=1
-
-# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
-# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
-# and RSSI) is met and then will initiate teardown when teardown criteria
-# (idle packet count and RSSI) is met.
-#  0 - disable
-#  1 - enable
-gEnableTDLSImplicitTrigger=1
-
 # Enable TDLS External Control. That is, user space application has to
 # first configure a peer MAC in wlan driver towards which TDLS is desired.
 # Device will establish TDLS only towards those configured peers whenever
@@ -521,7 +479,9 @@ TSOEnable=1
 # 1 - enable(default)  0 - disable
 #ifndef OPLUS_BUG_STABILITY
 #Rongzheng.tang@CONNECTIVITY.WiFi.Network.1389443, 2019/05/23
-GROEnable=1
+#GROEnable=1
+#else
+GROEnable=0
 #endif /* OPLUS_BUG_STABILITY */
 
 # Enable HT MPDU Density
@@ -595,10 +555,13 @@ enable_rtt_mac_randomization=1
 #gEnableConcurrentSTA=wlan1
 #endif /* OPLUS_BUG_STABILITY */
 
-#ifdef OPLUS_BUG_STABILITY
-#Aligning with Oneplus R ini parameters
-#Sukshata@CONNECTIVITY.WIFI.HARDWARE.RSSI.2810957,2022/01/04
-gEnableSNRMonitoring=1
+#Enable/Disable SNR monitoring
+#ifndef OPLUS_BUG_STABILITY
+#HuangJie@CONNECTIVITY.WIFI.CONNECT.AUTOCONNECT.1882408, 2019/03/13,
+#Modify for do not automatically connect strong signal hotspots
+#gEnableSNRMonitoring=1
+#else /* OPLUS_BUG_STABILITY */
+gEnableSNRMonitoring=0
 #endif /* OPLUS_BUG_STABILITY */
 
 #ifndef OPLUS_BUG_STABILITY
@@ -626,16 +589,14 @@ arp_ac_category=0
 #Add for set value of kick out, 2047 means if DUT missed 2047 packets from AP, then disconnect
 gDroppedPktDisconnectTh=2047
 
-#Add for set value of beacon miss, 15 and 25 means 40 beacon miss,then maybe trigger disconnect
-gRoamBmissFirstBcnt=15
-gRoamBmissFinalBcnt=25
+#Add for set value of beacon miss, 10 and 20 means 30 beacon miss,then maybe trigger disconnect
+gRoamBmissFirstBcnt=10
+gRoamBmissFinalBcnt=20
 #endif /* OPLUS_BUG_STABILITY */
 
 #ifdef OPLUS_BUG_STABILITY
-#Aligning with Oneplus R ini parameters
-#Sukshata@CONNECTIVITY.WIFI.TPUT.2896874 ,2022/01/07
-gEnableEdcaParams=0
-#endif OPLUS_BUG_STABILITY
+#HuangYuan@CONNECTIVITY.WIFI.NETWORK.1063633 2016/07/20, add for optimize download performance in noisy env.
+gEnableEdcaParams=1
 gEdcaVoCwmin=2
 gEdcaViCwmin=2
 gEdcaBkCwmin=2
@@ -710,6 +671,13 @@ gApLinkMonitorPeriod = 25
 gindoor_channel_support=1
 #endif /* OPLUS_BUG_COMPATIBILITY */
 
+#ifdef OPLUS_BUG_STABILITY
+#Qiulei@CONNECTIVITY.WiFi.Hardware.1132176, 2017/03/07
+#Add for 2.4G&5G MIMO config,2.4G SAP SISO
+gVdevTypeNss_5g=21930
+gVdevTypeNss_2g=21930
+#endif /* OPLUS_BUG_STABILITY */
+
 #ifdef OPLUS_BUG_STABILITY
 #Tao.Hui@CONNECTIVITY.WiFi.Basic.Custom.1884719 2019/03/08
 #add for bdf fw rus
@@ -719,7 +687,7 @@ gEnableForceTargetAssert=1
 #ifdef OPLUS_BUG_STABILITY
 #Yuan.Huang@CONNECTIVITY.WiFi.Network.internet.1809314, 2019/07/24,
 #Add for Dual STA connect leaky APs with 1x1
-gActionOUIConnect1x1=000C43 04 03000000 70 35 A2 000CE7 04 00000000 F0 35 A2 001018 06 0200000C0000 BC 2D 52 00E04C 03 020160 E0 35 A2
+gActionOUIConnect1x1=000C43 04 03000000 70 35 A2 000CE7 04 00000000 F0 35 A2 001018 06 0200000C0000 BC 2D 52
 #endif /* OPLUS_BUG_STABILITY */
 
 #ifndef OPLUS_BUG_STABILITY
@@ -744,31 +712,6 @@ enable_disconnect_roam_offload=0
 #endif /* OPLUS_BUG_STABILITY */
 
 
-#ifdef OPLUS_BUG_STABILITY
-#CuBotao@CONNECTIVITY.WIFI.CONNECT,Add for,2020/11/11
-gInitialScanNoDFSChnl=1
-#endif /* OPLUS_BUG_STABILITY */
-
-#ifdef OPLUS_BUG_STABILITY
-#HuChao@CONNECTIVITY.WIFI.CONNECTION.SCAN.787904,2021/01/04
-# Add for scan dev whose beacon is invalid with wrong length
-scan_allow_bss_with_corrupted_ie=1
-
-# Add for scan dev whose beacon channel mismatch
-drop_bcn_on_chan_mismatch=0
-#endif /*OPLUS_BUG_STABILITY*/
-
-#ifdef OPLUS_BUG_STABILITY
-#HuChao@CONNECTIVITY.WiFi.CONNECT.scan.719365, 2020/12/18,
-enable_pending_list_req=1
-#endif /* OPLUS_BUG_STABILITY */
-
-#ifdef OPLUS_BUG_STABILITY
-#Aligning with Oneplus R ini parameters
-#Sukshata@CONNECTIVITY.WIFI.HARDWARE.RSSI.2810957,2022/01/04
-g_disable_hw_assist=0
-gDualMacFeatureDisable=1
-#endif /* OPLUS_BUG_STABILITY */
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.b00 b/proprietary/vendor/firmware/lagoon_ipa_fws.b00
deleted file mode 100644
index a3b8156..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.b00 and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.b01 b/proprietary/vendor/firmware/lagoon_ipa_fws.b01
deleted file mode 100644
index 32df3d2..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.b01 and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.b02 b/proprietary/vendor/firmware/lagoon_ipa_fws.b02
deleted file mode 100644
index f4450d5..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.b02 and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.b03 b/proprietary/vendor/firmware/lagoon_ipa_fws.b03
deleted file mode 100644
index 4570aa1..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.b03 and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.b04 b/proprietary/vendor/firmware/lagoon_ipa_fws.b04
deleted file mode 100644
index 91256ad..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.b04 and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.elf b/proprietary/vendor/firmware/lagoon_ipa_fws.elf
deleted file mode 100644
index 9383036..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.elf and /dev/null differ
diff --git a/proprietary/vendor/firmware/lagoon_ipa_fws.mdt b/proprietary/vendor/firmware/lagoon_ipa_fws.mdt
deleted file mode 100644
index 689ffb6..0000000
Binary files a/proprietary/vendor/firmware/lagoon_ipa_fws.mdt and /dev/null differ
diff --git a/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/proprietary/vendor/lib/egl/libGLESv2_adreno.so
index 6f8f025..60a8016 100644
Binary files a/proprietary/vendor/lib/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libq3dtools_esx.so b/proprietary/vendor/lib/egl/libq3dtools_esx.so
index c75a1e5..5ad286b 100644
Binary files a/proprietary/vendor/lib/egl/libq3dtools_esx.so and b/proprietary/vendor/lib/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index 9ef2ea7..7eddebe 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
index f6de871..d69b964 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
index fa8a9bb..d66e75e 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
index eb8dbe8..e8d8892 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vulkan.adreno.so b/proprietary/vendor/lib/hw/vulkan.adreno.so
index f365a84..75c7776 100644
Binary files a/proprietary/vendor/lib/hw/vulkan.adreno.so and b/proprietary/vendor/lib/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib/libAlacSwDec.so b/proprietary/vendor/lib/libAlacSwDec.so
index 9210211..14526e4 100644
Binary files a/proprietary/vendor/lib/libAlacSwDec.so and b/proprietary/vendor/lib/libAlacSwDec.so differ
diff --git a/proprietary/vendor/lib/libApeSwDec.so b/proprietary/vendor/lib/libApeSwDec.so
index 3af9a88..8a490a8 100644
Binary files a/proprietary/vendor/lib/libApeSwDec.so and b/proprietary/vendor/lib/libApeSwDec.so differ
diff --git a/proprietary/vendor/lib/libCB.so b/proprietary/vendor/lib/libCB.so
index 27cd46c..3d3d43b 100644
Binary files a/proprietary/vendor/lib/libCB.so and b/proprietary/vendor/lib/libCB.so differ
diff --git a/proprietary/vendor/lib/libFileMux_proprietary.so b/proprietary/vendor/lib/libFileMux_proprietary.so
index e253a4a..f6ed1b4 100644
Binary files a/proprietary/vendor/lib/libFileMux_proprietary.so and b/proprietary/vendor/lib/libFileMux_proprietary.so differ
diff --git a/proprietary/vendor/lib/libFlacSwDec.so b/proprietary/vendor/lib/libFlacSwDec.so
index c1fb6bc..fab1db1 100644
Binary files a/proprietary/vendor/lib/libFlacSwDec.so and b/proprietary/vendor/lib/libFlacSwDec.so differ
diff --git a/proprietary/vendor/lib/libMpeg4SwEncoder.so b/proprietary/vendor/lib/libMpeg4SwEncoder.so
index a367e4b..84b0e40 100644
Binary files a/proprietary/vendor/lib/libMpeg4SwEncoder.so and b/proprietary/vendor/lib/libMpeg4SwEncoder.so differ
diff --git a/proprietary/vendor/lib/libMpeghSwEnc.so b/proprietary/vendor/lib/libMpeghSwEnc.so
index f417d7d..1a0e0db 100644
Binary files a/proprietary/vendor/lib/libMpeghSwEnc.so and b/proprietary/vendor/lib/libMpeghSwEnc.so differ
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
index d2fadea..868c6d2 100644
Binary files a/proprietary/vendor/lib/libOmxAacDec.so and b/proprietary/vendor/lib/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAlacDec.so b/proprietary/vendor/lib/libOmxAlacDec.so
index 1aeb713..cf0db8b 100644
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and b/proprietary/vendor/lib/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAlacDecSw.so b/proprietary/vendor/lib/libOmxAlacDecSw.so
index 64c3820..4e72b4c 100644
Binary files a/proprietary/vendor/lib/libOmxAlacDecSw.so and b/proprietary/vendor/lib/libOmxAlacDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrDec.so b/proprietary/vendor/lib/libOmxAmrDec.so
index ce5eaa7..47e2504 100644
Binary files a/proprietary/vendor/lib/libOmxAmrDec.so and b/proprietary/vendor/lib/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
index c5395ea..ce08a72 100644
Binary files a/proprietary/vendor/lib/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib/libOmxApeDec.so b/proprietary/vendor/lib/libOmxApeDec.so
index 963051a..b863ee6 100644
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and b/proprietary/vendor/lib/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib/libOmxApeDecSw.so b/proprietary/vendor/lib/libOmxApeDecSw.so
index 58c28e8..7bd267e 100644
Binary files a/proprietary/vendor/lib/libOmxApeDecSw.so and b/proprietary/vendor/lib/libOmxApeDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxDsdDec.so b/proprietary/vendor/lib/libOmxDsdDec.so
index c28ae75..9122578 100644
Binary files a/proprietary/vendor/lib/libOmxDsdDec.so and b/proprietary/vendor/lib/libOmxDsdDec.so differ
diff --git a/proprietary/vendor/lib/libOmxEvrcDec.so b/proprietary/vendor/lib/libOmxEvrcDec.so
index 795a2dd..0deb737 100644
Binary files a/proprietary/vendor/lib/libOmxEvrcDec.so and b/proprietary/vendor/lib/libOmxEvrcDec.so differ
diff --git a/proprietary/vendor/lib/libOmxG711Dec.so b/proprietary/vendor/lib/libOmxG711Dec.so
index c36a3be..b88ed7d 100644
Binary files a/proprietary/vendor/lib/libOmxG711Dec.so and b/proprietary/vendor/lib/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxMpeghDecSw.so b/proprietary/vendor/lib/libOmxMpeghDecSw.so
index dfa436b..b19d8b8 100644
Binary files a/proprietary/vendor/lib/libOmxMpeghDecSw.so and b/proprietary/vendor/lib/libOmxMpeghDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxMpeghEncSw.so b/proprietary/vendor/lib/libOmxMpeghEncSw.so
index 73342e7..46738da 100644
Binary files a/proprietary/vendor/lib/libOmxMpeghEncSw.so and b/proprietary/vendor/lib/libOmxMpeghEncSw.so differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
index 4434163..2653567 100644
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and b/proprietary/vendor/lib/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxSwVdec.so b/proprietary/vendor/lib/libOmxSwVdec.so
index 6e10f27..2914fd3 100644
Binary files a/proprietary/vendor/lib/libOmxSwVdec.so and b/proprietary/vendor/lib/libOmxSwVdec.so differ
diff --git a/proprietary/vendor/lib/libOmxSwVencMpeg4.so b/proprietary/vendor/lib/libOmxSwVencMpeg4.so
index c5ea264..5b4d80e 100644
Binary files a/proprietary/vendor/lib/libOmxSwVencMpeg4.so and b/proprietary/vendor/lib/libOmxSwVencMpeg4.so differ
diff --git a/proprietary/vendor/lib/libOmxVideoDSMode.so b/proprietary/vendor/lib/libOmxVideoDSMode.so
index a871e33..667e587 100644
Binary files a/proprietary/vendor/lib/libOmxVideoDSMode.so and b/proprietary/vendor/lib/libOmxVideoDSMode.so differ
diff --git a/proprietary/vendor/lib/libOmxVpp.so b/proprietary/vendor/lib/libOmxVpp.so
index f89da3d..9d678da 100644
Binary files a/proprietary/vendor/lib/libOmxVpp.so and b/proprietary/vendor/lib/libOmxVpp.so differ
diff --git a/proprietary/vendor/lib/libVkLayer_q3dtools.so b/proprietary/vendor/lib/libVkLayer_q3dtools.so
index 50e8561..f0c2d42 100644
Binary files a/proprietary/vendor/lib/libVkLayer_q3dtools.so and b/proprietary/vendor/lib/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib/libadreno_utils.so b/proprietary/vendor/lib/libadreno_utils.so
index c0a943f..41eac84 100644
Binary files a/proprietary/vendor/lib/libadreno_utils.so and b/proprietary/vendor/lib/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so
index 97bb0c1..0b51fdb 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so
index 6dc4bab..876df78 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so differ
diff --git a/proprietary/vendor/lib/libcdsp_default_listener.so b/proprietary/vendor/lib/libcdsp_default_listener.so
index bed5b02..8c11261 100644
Binary files a/proprietary/vendor/lib/libcdsp_default_listener.so and b/proprietary/vendor/lib/libcdsp_default_listener.so differ
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
index 0594072..09309b0 100644
Binary files a/proprietary/vendor/lib/libcdsprpc.so and b/proprietary/vendor/lib/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib/libdiag.so b/proprietary/vendor/lib/libdiag.so
index dfc5f9b..0572bbe 100644
Binary files a/proprietary/vendor/lib/libdiag.so and b/proprietary/vendor/lib/libdiag.so differ
diff --git a/proprietary/vendor/lib/libdsd2pcm.so b/proprietary/vendor/lib/libdsd2pcm.so
index 54bda6b..70e0d6c 100644
Binary files a/proprietary/vendor/lib/libdsd2pcm.so and b/proprietary/vendor/lib/libdsd2pcm.so differ
diff --git a/proprietary/vendor/lib/libdsi_netctrl.so b/proprietary/vendor/lib/libdsi_netctrl.so
index 4d108e2..758526c 100644
Binary files a/proprietary/vendor/lib/libdsi_netctrl.so and b/proprietary/vendor/lib/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib/libdsutils.so b/proprietary/vendor/lib/libdsutils.so
index 58f26ee..5e7582d 100644
Binary files a/proprietary/vendor/lib/libdsutils.so and b/proprietary/vendor/lib/libdsutils.so differ
diff --git a/proprietary/vendor/lib/libfastcrc.so b/proprietary/vendor/lib/libfastcrc.so
index 49f41ea..4cfa3ad 100644
Binary files a/proprietary/vendor/lib/libfastcrc.so and b/proprietary/vendor/lib/libfastcrc.so differ
diff --git a/proprietary/vendor/lib/libfastcvdsp_stub.so b/proprietary/vendor/lib/libfastcvdsp_stub.so
index 15b291b..f8de748 100644
Binary files a/proprietary/vendor/lib/libfastcvdsp_stub.so and b/proprietary/vendor/lib/libfastcvdsp_stub.so differ
diff --git a/proprietary/vendor/lib/libfastcvopt.so b/proprietary/vendor/lib/libfastcvopt.so
index 5623f0f..2480b75 100644
Binary files a/proprietary/vendor/lib/libfastcvopt.so and b/proprietary/vendor/lib/libfastcvopt.so differ
diff --git a/proprietary/vendor/lib/libgpudataproducer.so b/proprietary/vendor/lib/libgpudataproducer.so
index 135ae97..101fac3 100644
Binary files a/proprietary/vendor/lib/libgpudataproducer.so and b/proprietary/vendor/lib/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib/libgsl.so b/proprietary/vendor/lib/libgsl.so
index 92f0d44..b9a03c4 100644
Binary files a/proprietary/vendor/lib/libgsl.so and b/proprietary/vendor/lib/libgsl.so differ
diff --git a/proprietary/vendor/lib/libllvm-glnext.so b/proprietary/vendor/lib/libllvm-glnext.so
index ad14f42..d97c0c1 100644
Binary files a/proprietary/vendor/lib/libllvm-glnext.so and b/proprietary/vendor/lib/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib/libllvm-qcom.so b/proprietary/vendor/lib/libllvm-qcom.so
index 17ba75f..610f229 100644
Binary files a/proprietary/vendor/lib/libllvm-qcom.so and b/proprietary/vendor/lib/libllvm-qcom.so differ
diff --git a/proprietary/vendor/lib/libmdsprpc.so b/proprietary/vendor/lib/libmdsprpc.so
index 653ffe2..aca2a4b 100644
Binary files a/proprietary/vendor/lib/libmdsprpc.so and b/proprietary/vendor/lib/libmdsprpc.so differ
diff --git a/proprietary/vendor/lib/libmm-hdcpmgr.so b/proprietary/vendor/lib/libmm-hdcpmgr.so
index 1a737ab..539ab13 100644
Binary files a/proprietary/vendor/lib/libmm-hdcpmgr.so and b/proprietary/vendor/lib/libmm-hdcpmgr.so differ
diff --git a/proprietary/vendor/lib/libmmosal.so b/proprietary/vendor/lib/libmmosal.so
index 2c1e0b1..282d59a 100644
Binary files a/proprietary/vendor/lib/libmmosal.so and b/proprietary/vendor/lib/libmmosal.so differ
diff --git a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so
index d16a1dd..fc56cfa 100644
Binary files a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so and b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so differ
diff --git a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so
index e87ccf9..7af226d 100644
Binary files a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so and b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so differ
diff --git a/proprietary/vendor/lib/libperfconfig.so b/proprietary/vendor/lib/libperfconfig.so
index 54d110f..2cd8662 100644
Binary files a/proprietary/vendor/lib/libperfconfig.so and b/proprietary/vendor/lib/libperfconfig.so differ
diff --git a/proprietary/vendor/lib/libperfgluelayer.so b/proprietary/vendor/lib/libperfgluelayer.so
index b1100ea..cce6706 100644
Binary files a/proprietary/vendor/lib/libperfgluelayer.so and b/proprietary/vendor/lib/libperfgluelayer.so differ
diff --git a/proprietary/vendor/lib/libqcmaputils.so b/proprietary/vendor/lib/libqcmaputils.so
index f5a966c..322d343 100644
Binary files a/proprietary/vendor/lib/libqcmaputils.so and b/proprietary/vendor/lib/libqcmaputils.so differ
diff --git a/proprietary/vendor/lib/libqdi.so b/proprietary/vendor/lib/libqdi.so
index 41365e0..219395d 100644
Binary files a/proprietary/vendor/lib/libqdi.so and b/proprietary/vendor/lib/libqdi.so differ
diff --git a/proprietary/vendor/lib/libqdp.so b/proprietary/vendor/lib/libqdp.so
index caf376f..83fc893 100644
Binary files a/proprietary/vendor/lib/libqdp.so and b/proprietary/vendor/lib/libqdp.so differ
diff --git a/proprietary/vendor/lib/libqmi.so b/proprietary/vendor/lib/libqmi.so
index 59c3e62..ca01c1b 100644
Binary files a/proprietary/vendor/lib/libqmi.so and b/proprietary/vendor/lib/libqmi.so differ
diff --git a/proprietary/vendor/lib/libqmi_cci.so b/proprietary/vendor/lib/libqmi_cci.so
index 9ba8da2..9b41a27 100644
Binary files a/proprietary/vendor/lib/libqmi_cci.so and b/proprietary/vendor/lib/libqmi_cci.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_helper.so b/proprietary/vendor/lib/libqmi_client_helper.so
index aad637a..e5d8e32 100644
Binary files a/proprietary/vendor/lib/libqmi_client_helper.so and b/proprietary/vendor/lib/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_qmux.so b/proprietary/vendor/lib/libqmi_client_qmux.so
index a37115b..8fc79c5 100644
Binary files a/proprietary/vendor/lib/libqmi_client_qmux.so and b/proprietary/vendor/lib/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib/libqmi_csi.so b/proprietary/vendor/lib/libqmi_csi.so
index 20e9c10..90a5c70 100644
Binary files a/proprietary/vendor/lib/libqmi_csi.so and b/proprietary/vendor/lib/libqmi_csi.so differ
diff --git a/proprietary/vendor/lib/libqmiservices.so b/proprietary/vendor/lib/libqmiservices.so
index 8223446..4146db7 100644
Binary files a/proprietary/vendor/lib/libqmiservices.so and b/proprietary/vendor/lib/libqmiservices.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd-client.so b/proprietary/vendor/lib/libqti-perfd-client.so
index 08d9141..11d4216 100644
Binary files a/proprietary/vendor/lib/libqti-perfd-client.so and b/proprietary/vendor/lib/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd.so b/proprietary/vendor/lib/libqti-perfd.so
index 80c82d2..8115554 100644
Binary files a/proprietary/vendor/lib/libqti-perfd.so and b/proprietary/vendor/lib/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib/libqti-util.so b/proprietary/vendor/lib/libqti-util.so
index e56dc83..e0270fe 100644
Binary files a/proprietary/vendor/lib/libqti-util.so and b/proprietary/vendor/lib/libqti-util.so differ
diff --git a/proprietary/vendor/lib/libscveCommon.so b/proprietary/vendor/lib/libscveCommon.so
index 4b2c3a7..41a86a4 100644
Binary files a/proprietary/vendor/lib/libscveCommon.so and b/proprietary/vendor/lib/libscveCommon.so differ
diff --git a/proprietary/vendor/lib/libscveCommon_stub.so b/proprietary/vendor/lib/libscveCommon_stub.so
index dcce53a..fc4f5d0 100644
Binary files a/proprietary/vendor/lib/libscveCommon_stub.so and b/proprietary/vendor/lib/libscveCommon_stub.so differ
diff --git a/proprietary/vendor/lib/libscveObjectSegmentation.so b/proprietary/vendor/lib/libscveObjectSegmentation.so
index 93299f1..ddafacc 100644
Binary files a/proprietary/vendor/lib/libscveObjectSegmentation.so and b/proprietary/vendor/lib/libscveObjectSegmentation.so differ
diff --git a/proprietary/vendor/lib/libscveObjectSegmentation_stub.so b/proprietary/vendor/lib/libscveObjectSegmentation_stub.so
index 652c7ab..181d1e7 100644
Binary files a/proprietary/vendor/lib/libscveObjectSegmentation_stub.so and b/proprietary/vendor/lib/libscveObjectSegmentation_stub.so differ
diff --git a/proprietary/vendor/lib/libscveObjectTracker.so b/proprietary/vendor/lib/libscveObjectTracker.so
index aea6cbf..42cbeae 100644
Binary files a/proprietary/vendor/lib/libscveObjectTracker.so and b/proprietary/vendor/lib/libscveObjectTracker.so differ
diff --git a/proprietary/vendor/lib/libscveObjectTracker_stub.so b/proprietary/vendor/lib/libscveObjectTracker_stub.so
index 8465b4b..93ca428 100644
Binary files a/proprietary/vendor/lib/libscveObjectTracker_stub.so and b/proprietary/vendor/lib/libscveObjectTracker_stub.so differ
diff --git a/proprietary/vendor/lib/libsdsprpc.so b/proprietary/vendor/lib/libsdsprpc.so
index 95a34e1..e09014f 100644
Binary files a/proprietary/vendor/lib/libsdsprpc.so and b/proprietary/vendor/lib/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib/libswvdec.so b/proprietary/vendor/lib/libswvdec.so
index c4e467a..452968b 100644
Binary files a/proprietary/vendor/lib/libswvdec.so and b/proprietary/vendor/lib/libswvdec.so differ
diff --git a/proprietary/vendor/lib/libsysmon_cdsp_skel.so b/proprietary/vendor/lib/libsysmon_cdsp_skel.so
index 04692c1..fd956ce 100644
Binary files a/proprietary/vendor/lib/libsysmon_cdsp_skel.so and b/proprietary/vendor/lib/libsysmon_cdsp_skel.so differ
diff --git a/proprietary/vendor/lib/libvppclient.so b/proprietary/vendor/lib/libvppclient.so
index dbc2a56..88cb94e 100644
Binary files a/proprietary/vendor/lib/libvppclient.so and b/proprietary/vendor/lib/libvppclient.so differ
diff --git a/proprietary/vendor/lib/libvpphcp.so b/proprietary/vendor/lib/libvpphcp.so
index e8e4028..ff95dbe 100644
Binary files a/proprietary/vendor/lib/libvpphcp.so and b/proprietary/vendor/lib/libvpphcp.so differ
diff --git a/proprietary/vendor/lib/libvpphvx.so b/proprietary/vendor/lib/libvpphvx.so
index 934db51..89a5395 100644
Binary files a/proprietary/vendor/lib/libvpphvx.so and b/proprietary/vendor/lib/libvpphvx.so differ
diff --git a/proprietary/vendor/lib/libvpplibrary.so b/proprietary/vendor/lib/libvpplibrary.so
index 0914bb7..2946b53 100644
Binary files a/proprietary/vendor/lib/libvpplibrary.so and b/proprietary/vendor/lib/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so b/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so
index 4c12229..754d7d9 100644
Binary files a/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so and b/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
index a2fce9b..ca92fa8 100644
Binary files a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so
index 4afed23..a4baa8b 100644
Binary files a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so and b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
index abb23e8..72dae18 100644
Binary files a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdhdcpcp.so b/proprietary/vendor/lib/libwfdhdcpcp.so
index 57c33c4..e5c2669 100644
Binary files a/proprietary/vendor/lib/libwfdhdcpcp.so and b/proprietary/vendor/lib/libwfdhdcpcp.so differ
diff --git a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so
index 54c05c5..0d23b49 100644
Binary files a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so and b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmminterface_proprietary.so b/proprietary/vendor/lib/libwfdmminterface_proprietary.so
index f30349b..c22eebd 100644
Binary files a/proprietary/vendor/lib/libwfdmminterface_proprietary.so and b/proprietary/vendor/lib/libwfdmminterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmmservice_proprietary.so b/proprietary/vendor/lib/libwfdmmservice_proprietary.so
index 6fc025b..9f07e30 100644
Binary files a/proprietary/vendor/lib/libwfdmmservice_proprietary.so and b/proprietary/vendor/lib/libwfdmmservice_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so
index 367f8e0..5db60fe 100644
Binary files a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so and b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/proprietary/vendor/lib/libwfdmodulehdcpsession.so
index 40ba567..4a5be2d 100644
Binary files a/proprietary/vendor/lib/libwfdmodulehdcpsession.so and b/proprietary/vendor/lib/libwfdmodulehdcpsession.so differ
diff --git a/proprietary/vendor/lib/libwfdrtsp_proprietary.so b/proprietary/vendor/lib/libwfdrtsp_proprietary.so
index 3ad6450..0a2d745 100644
Binary files a/proprietary/vendor/lib/libwfdrtsp_proprietary.so and b/proprietary/vendor/lib/libwfdrtsp_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdsessionmodule.so b/proprietary/vendor/lib/libwfdsessionmodule.so
index d342455..102eded 100644
Binary files a/proprietary/vendor/lib/libwfdsessionmodule.so and b/proprietary/vendor/lib/libwfdsessionmodule.so differ
diff --git a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so
index ce2e084..fc5c8e1 100644
Binary files a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so and b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so
index 30d3a08..50aefd1 100644
Binary files a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so and b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so
index 9099678..52e77f4 100644
Binary files a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsink_proprietary.so b/proprietary/vendor/lib/libwfduibcsink_proprietary.so
index 338091d..f909dcd 100644
Binary files a/proprietary/vendor/lib/libwfduibcsink_proprietary.so and b/proprietary/vendor/lib/libwfduibcsink_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so
index 3b451b2..a4e6353 100644
Binary files a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so
index 83a6208..9ce96e0 100644
Binary files a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so and b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so
index d4e0d08..fe305ea 100644
Binary files a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdutils_proprietary.so b/proprietary/vendor/lib/libwfdutils_proprietary.so
index c56c786..5e42ce6 100644
Binary files a/proprietary/vendor/lib/libwfdutils_proprietary.so and b/proprietary/vendor/lib/libwfdutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so
index 3221e5e..98eafc4 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so and b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so
index 09d838c..bfcb670 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so and b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.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
index 453066b..fae0361 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so and b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so
index 5668da4..cbf3cba 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so and b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so
index 453fbff..50e9520 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so and b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so
index b8b8d69..cac6da2 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so and b/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
index 8dfca15..7c1ede5 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
index b770ae3..208fd11 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
index 53dcf64..9f28bc0 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so
index dd07a6b..f79d906 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so
index 9e1e7d4..8e350d1 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so
index 00075f9..22d20cd 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so and b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so
index f1a362e..9e968c0 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so and b/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so
index 7a64f4c..4842b6b 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so
index f3040c4..568a5dc 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so and b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so
index a07f1f0..4bdf1ff 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so and b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so differ
diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so
index e386d61..e5a2eb4 100644
Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so and b/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so differ
diff --git a/proprietary/vendor/lib64/deviceInfoServiceModule.so b/proprietary/vendor/lib64/deviceInfoServiceModule.so
index ccc285e..40db74d 100644
Binary files a/proprietary/vendor/lib64/deviceInfoServiceModule.so and b/proprietary/vendor/lib64/deviceInfoServiceModule.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so
index 76410ac..cebb824 100644
Binary files a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libq3dtools_esx.so b/proprietary/vendor/lib64/egl/libq3dtools_esx.so
index 94184da..e3eb37e 100644
Binary files a/proprietary/vendor/lib64/egl/libq3dtools_esx.so and b/proprietary/vendor/lib64/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
index 637b2e8..52a71d8 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
index 96a6146..24a66eb 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
index 0920433..9e64ea3 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
index ffb7c7d..80fc92c 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
index e776fae..0ac4cb5 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
index b146566..8e14f05 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
index c1cfee5..b444944 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
index e34ae14..f843115 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
index e486b36..83eb8b1 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
index b144fcb..ecf4004 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
index 73fc280..f202f30 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
index 8864a3d..0af0f9a 100644
Binary files a/proprietary/vendor/lib64/hw/vulkan.adreno.so and b/proprietary/vendor/lib64/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib64/lib-imscmservice.so b/proprietary/vendor/lib64/lib-imscmservice.so
index 9124058..95a8d82 100644
Binary files a/proprietary/vendor/lib64/lib-imscmservice.so and b/proprietary/vendor/lib64/lib-imscmservice.so differ
diff --git a/proprietary/vendor/lib64/lib-imsdpl.so b/proprietary/vendor/lib64/lib-imsdpl.so
index e37b44f..7534261 100644
Binary files a/proprietary/vendor/lib64/lib-imsdpl.so and b/proprietary/vendor/lib64/lib-imsdpl.so differ
diff --git a/proprietary/vendor/lib64/lib-imsqimf.so b/proprietary/vendor/lib64/lib-imsqimf.so
index a3da484..5009eb9 100644
Binary files a/proprietary/vendor/lib64/lib-imsqimf.so and b/proprietary/vendor/lib64/lib-imsqimf.so differ
diff --git a/proprietary/vendor/lib64/lib-imsrcs-v2.so b/proprietary/vendor/lib64/lib-imsrcs-v2.so
index 10582b1..9ccc56e 100644
Binary files a/proprietary/vendor/lib64/lib-imsrcs-v2.so and b/proprietary/vendor/lib64/lib-imsrcs-v2.so differ
diff --git a/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so b/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so
index b1f7cae..c346cc1 100644
Binary files a/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so and b/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so differ
diff --git a/proprietary/vendor/lib64/lib-imsvtcore.so b/proprietary/vendor/lib64/lib-imsvtcore.so
index 75190bf..ee0b47d 100644
Binary files a/proprietary/vendor/lib64/lib-imsvtcore.so and b/proprietary/vendor/lib64/lib-imsvtcore.so differ
diff --git a/proprietary/vendor/lib64/lib-imsxml.so b/proprietary/vendor/lib64/lib-imsxml.so
index 2cd5cab..0829744 100644
Binary files a/proprietary/vendor/lib64/lib-imsxml.so and b/proprietary/vendor/lib64/lib-imsxml.so differ
diff --git a/proprietary/vendor/lib64/lib-rcsconfig.so b/proprietary/vendor/lib64/lib-rcsconfig.so
index 68d0301..51435d7 100644
Binary files a/proprietary/vendor/lib64/lib-rcsconfig.so and b/proprietary/vendor/lib64/lib-rcsconfig.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcommon.so b/proprietary/vendor/lib64/lib-rtpcommon.so
index b2d21ae..7bd0bb8 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcommon.so and b/proprietary/vendor/lib64/lib-rtpcommon.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcore.so b/proprietary/vendor/lib64/lib-rtpcore.so
index 36f444e..9471404 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcore.so and b/proprietary/vendor/lib64/lib-rtpcore.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpsl.so b/proprietary/vendor/lib64/lib-rtpsl.so
index 715575d..536bb1a 100644
Binary files a/proprietary/vendor/lib64/lib-rtpsl.so and b/proprietary/vendor/lib64/lib-rtpsl.so differ
diff --git a/proprietary/vendor/lib64/lib-siputility.so b/proprietary/vendor/lib64/lib-siputility.so
index 186c4c2..5ab6e3f 100644
Binary files a/proprietary/vendor/lib64/lib-siputility.so and b/proprietary/vendor/lib64/lib-siputility.so differ
diff --git a/proprietary/vendor/lib64/lib-uceservice.so b/proprietary/vendor/lib64/lib-uceservice.so
index 52f0731..bd26992 100644
Binary files a/proprietary/vendor/lib64/lib-uceservice.so and b/proprietary/vendor/lib64/lib-uceservice.so differ
diff --git a/proprietary/vendor/lib64/libAlacSwDec.so b/proprietary/vendor/lib64/libAlacSwDec.so
index 695065d..d954314 100644
Binary files a/proprietary/vendor/lib64/libAlacSwDec.so and b/proprietary/vendor/lib64/libAlacSwDec.so differ
diff --git a/proprietary/vendor/lib64/libApeSwDec.so b/proprietary/vendor/lib64/libApeSwDec.so
index 1cab2f5..49d33ea 100644
Binary files a/proprietary/vendor/lib64/libApeSwDec.so and b/proprietary/vendor/lib64/libApeSwDec.so differ
diff --git a/proprietary/vendor/lib64/libCB.so b/proprietary/vendor/lib64/libCB.so
index edcca9d..81bcfbc 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libFlacSwDec.so b/proprietary/vendor/lib64/libFlacSwDec.so
index 9666c39..2e57c7c 100644
Binary files a/proprietary/vendor/lib64/libFlacSwDec.so and b/proprietary/vendor/lib64/libFlacSwDec.so differ
diff --git a/proprietary/vendor/lib64/libGPQTEEC_vendor.so b/proprietary/vendor/lib64/libGPQTEEC_vendor.so
index 87a7db6..e4bc887 100644
Binary files a/proprietary/vendor/lib64/libGPQTEEC_vendor.so and b/proprietary/vendor/lib64/libGPQTEEC_vendor.so differ
diff --git a/proprietary/vendor/lib64/libGPTEE_vendor.so b/proprietary/vendor/lib64/libGPTEE_vendor.so
index 8c333cf..915c123 100644
Binary files a/proprietary/vendor/lib64/libGPTEE_vendor.so and b/proprietary/vendor/lib64/libGPTEE_vendor.so differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel.so b/proprietary/vendor/lib64/libGPreqcancel.so
index 4f1c8a9..647b1e8 100644
Binary files a/proprietary/vendor/lib64/libGPreqcancel.so and b/proprietary/vendor/lib64/libGPreqcancel.so differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel_svc.so b/proprietary/vendor/lib64/libGPreqcancel_svc.so
index 282dcac..c791fa8 100644
Binary files a/proprietary/vendor/lib64/libGPreqcancel_svc.so and b/proprietary/vendor/lib64/libGPreqcancel_svc.so differ
diff --git a/proprietary/vendor/lib64/libMpeg4SwEncoder.so b/proprietary/vendor/lib64/libMpeg4SwEncoder.so
index cf35a8a..0168a06 100644
Binary files a/proprietary/vendor/lib64/libMpeg4SwEncoder.so and b/proprietary/vendor/lib64/libMpeg4SwEncoder.so differ
diff --git a/proprietary/vendor/lib64/libMpeghSwEnc.so b/proprietary/vendor/lib64/libMpeghSwEnc.so
index e0c0b5c..fa27bfe 100644
Binary files a/proprietary/vendor/lib64/libMpeghSwEnc.so and b/proprietary/vendor/lib64/libMpeghSwEnc.so differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
index 9a8e5c4..8c81abc 100644
Binary files a/proprietary/vendor/lib64/libOmxAacDec.so and b/proprietary/vendor/lib64/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDec.so b/proprietary/vendor/lib64/libOmxAlacDec.so
index a6039d8..280c1da 100644
Binary files a/proprietary/vendor/lib64/libOmxAlacDec.so and b/proprietary/vendor/lib64/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDecSw.so b/proprietary/vendor/lib64/libOmxAlacDecSw.so
index 149eb8c..375847a 100644
Binary files a/proprietary/vendor/lib64/libOmxAlacDecSw.so and b/proprietary/vendor/lib64/libOmxAlacDecSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrDec.so b/proprietary/vendor/lib64/libOmxAmrDec.so
index bf0b218..1868525 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrDec.so and b/proprietary/vendor/lib64/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so
index 5d02b65..311c778 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxApeDec.so b/proprietary/vendor/lib64/libOmxApeDec.so
index bbac23e..64fd038 100644
Binary files a/proprietary/vendor/lib64/libOmxApeDec.so and b/proprietary/vendor/lib64/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxApeDecSw.so b/proprietary/vendor/lib64/libOmxApeDecSw.so
index c1f4f5c..651d6cc 100644
Binary files a/proprietary/vendor/lib64/libOmxApeDecSw.so and b/proprietary/vendor/lib64/libOmxApeDecSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxEvrcDec.so b/proprietary/vendor/lib64/libOmxEvrcDec.so
index 6e85792..8592cee 100644
Binary files a/proprietary/vendor/lib64/libOmxEvrcDec.so and b/proprietary/vendor/lib64/libOmxEvrcDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxG711Dec.so b/proprietary/vendor/lib64/libOmxG711Dec.so
index f4b87bc..f795634 100644
Binary files a/proprietary/vendor/lib64/libOmxG711Dec.so and b/proprietary/vendor/lib64/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxMpeghEncSw.so b/proprietary/vendor/lib64/libOmxMpeghEncSw.so
index 4844e5c..84a27d2 100644
Binary files a/proprietary/vendor/lib64/libOmxMpeghEncSw.so and b/proprietary/vendor/lib64/libOmxMpeghEncSw.so differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
index 9107ff2..316fd5f 100644
Binary files a/proprietary/vendor/lib64/libOmxQcelp13Dec.so and b/proprietary/vendor/lib64/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxSwVdec.so b/proprietary/vendor/lib64/libOmxSwVdec.so
index 4f7c85b..6b0fb1a 100644
Binary files a/proprietary/vendor/lib64/libOmxSwVdec.so and b/proprietary/vendor/lib64/libOmxSwVdec.so differ
diff --git a/proprietary/vendor/lib64/libOmxSwVencMpeg4.so b/proprietary/vendor/lib64/libOmxSwVencMpeg4.so
index 4da150d..8adf2f3 100644
Binary files a/proprietary/vendor/lib64/libOmxSwVencMpeg4.so and b/proprietary/vendor/lib64/libOmxSwVencMpeg4.so differ
diff --git a/proprietary/vendor/lib64/libOmxVpp.so b/proprietary/vendor/lib64/libOmxVpp.so
index f8e0471..be97bee 100644
Binary files a/proprietary/vendor/lib64/libOmxVpp.so and b/proprietary/vendor/lib64/libOmxVpp.so differ
diff --git a/proprietary/vendor/lib64/libQSEEComAPI.so b/proprietary/vendor/lib64/libQSEEComAPI.so
index 1c72519..fd0066f 100644
Binary files a/proprietary/vendor/lib64/libQSEEComAPI.so and b/proprietary/vendor/lib64/libQSEEComAPI.so differ
diff --git a/proprietary/vendor/lib64/libQTEEConnector_vendor.so b/proprietary/vendor/lib64/libQTEEConnector_vendor.so
index 37cdfc6..de1be6f 100644
Binary files a/proprietary/vendor/lib64/libQTEEConnector_vendor.so and b/proprietary/vendor/lib64/libQTEEConnector_vendor.so differ
diff --git a/proprietary/vendor/lib64/libSecureUILib.so b/proprietary/vendor/lib64/libSecureUILib.so
index 038f491..be26bb1 100644
Binary files a/proprietary/vendor/lib64/libSecureUILib.so and b/proprietary/vendor/lib64/libSecureUILib.so differ
diff --git a/proprietary/vendor/lib64/libVkLayer_q3dtools.so b/proprietary/vendor/lib64/libVkLayer_q3dtools.so
index da481c7..6db22d0 100644
Binary files a/proprietary/vendor/lib64/libVkLayer_q3dtools.so and b/proprietary/vendor/lib64/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib64/libadreno_utils.so b/proprietary/vendor/lib64/libadreno_utils.so
index 99ae2b7..351a057 100644
Binary files a/proprietary/vendor/lib64/libadreno_utils.so and b/proprietary/vendor/lib64/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib64/libadsp_default_listener.so b/proprietary/vendor/lib64/libadsp_default_listener.so
index 3d84ea0..1f2915e 100644
Binary files a/proprietary/vendor/lib64/libadsp_default_listener.so and b/proprietary/vendor/lib64/libadsp_default_listener.so differ
diff --git a/proprietary/vendor/lib64/libaoa.so b/proprietary/vendor/lib64/libaoa.so
index a7dfe70..313e538 100644
Binary files a/proprietary/vendor/lib64/libaoa.so and b/proprietary/vendor/lib64/libaoa.so differ
diff --git a/proprietary/vendor/lib64/libasn1cper.so b/proprietary/vendor/lib64/libasn1cper.so
index 58d3dd8..e18006f 100644
Binary files a/proprietary/vendor/lib64/libasn1cper.so and b/proprietary/vendor/lib64/libasn1cper.so differ
diff --git a/proprietary/vendor/lib64/libasn1crt.so b/proprietary/vendor/lib64/libasn1crt.so
index 6e78a06..8f9568b 100644
Binary files a/proprietary/vendor/lib64/libasn1crt.so and b/proprietary/vendor/lib64/libasn1crt.so differ
diff --git a/proprietary/vendor/lib64/libasn1crtx.so b/proprietary/vendor/lib64/libasn1crtx.so
index 9e1af50..abb2c86 100644
Binary files a/proprietary/vendor/lib64/libasn1crtx.so and b/proprietary/vendor/lib64/libasn1crtx.so differ
diff --git a/proprietary/vendor/lib64/libbatching.so b/proprietary/vendor/lib64/libbatching.so
index 5253d21..4931017 100644
Binary files a/proprietary/vendor/lib64/libbatching.so and b/proprietary/vendor/lib64/libbatching.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so
index 0b14631..03c45af 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so
index b6f3f60..7a6a7e1 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so differ
diff --git a/proprietary/vendor/lib64/libcacertclient.so b/proprietary/vendor/lib64/libcacertclient.so
index 4702b32..41ff055 100644
Binary files a/proprietary/vendor/lib64/libcacertclient.so and b/proprietary/vendor/lib64/libcacertclient.so differ
diff --git a/proprietary/vendor/lib64/libcdfw.so b/proprietary/vendor/lib64/libcdfw.so
index f7dccc5..24247b0 100644
Binary files a/proprietary/vendor/lib64/libcdfw.so and b/proprietary/vendor/lib64/libcdfw.so differ
diff --git a/proprietary/vendor/lib64/libcdfw_remote_api.so b/proprietary/vendor/lib64/libcdfw_remote_api.so
index 6fd2bdb..2597a09 100644
Binary files a/proprietary/vendor/lib64/libcdfw_remote_api.so and b/proprietary/vendor/lib64/libcdfw_remote_api.so differ
diff --git a/proprietary/vendor/lib64/libcdsp_default_listener.so b/proprietary/vendor/lib64/libcdsp_default_listener.so
index c92e41d..0a0359f 100644
Binary files a/proprietary/vendor/lib64/libcdsp_default_listener.so and b/proprietary/vendor/lib64/libcdsp_default_listener.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc.so b/proprietary/vendor/lib64/libcdsprpc.so
index deeede2..c73135e 100644
Binary files a/proprietary/vendor/lib64/libcdsprpc.so and b/proprietary/vendor/lib64/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libcne.so b/proprietary/vendor/lib64/libcne.so
index d4fdf8b..6ce0021 100644
Binary files a/proprietary/vendor/lib64/libcne.so and b/proprietary/vendor/lib64/libcne.so differ
diff --git a/proprietary/vendor/lib64/libcneapiclient.so b/proprietary/vendor/lib64/libcneapiclient.so
index b7faeba..821f1de 100644
Binary files a/proprietary/vendor/lib64/libcneapiclient.so and b/proprietary/vendor/lib64/libcneapiclient.so differ
diff --git a/proprietary/vendor/lib64/libcneoplookup.so b/proprietary/vendor/lib64/libcneoplookup.so
index c02dc83..59f79e8 100644
Binary files a/proprietary/vendor/lib64/libcneoplookup.so and b/proprietary/vendor/lib64/libcneoplookup.so differ
diff --git a/proprietary/vendor/lib64/libconfigdb.so b/proprietary/vendor/lib64/libconfigdb.so
index b38cf40..43ab31c 100644
Binary files a/proprietary/vendor/lib64/libconfigdb.so and b/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/proprietary/vendor/lib64/libcpion.so b/proprietary/vendor/lib64/libcpion.so
index 9bc804a..2b598a1 100644
Binary files a/proprietary/vendor/lib64/libcpion.so and b/proprietary/vendor/lib64/libcpion.so differ
diff --git a/proprietary/vendor/lib64/libdataitems.so b/proprietary/vendor/lib64/libdataitems.so
index 5e92af2..a4b2788 100644
Binary files a/proprietary/vendor/lib64/libdataitems.so and b/proprietary/vendor/lib64/libdataitems.so differ
diff --git a/proprietary/vendor/lib64/libdiag.so b/proprietary/vendor/lib64/libdiag.so
index 7b3552d..fb47f9f 100644
Binary files a/proprietary/vendor/lib64/libdiag.so and b/proprietary/vendor/lib64/libdiag.so differ
diff --git a/proprietary/vendor/lib64/libdpmqmihal.so b/proprietary/vendor/lib64/libdpmqmihal.so
index 2857179..0817e23 100644
Binary files a/proprietary/vendor/lib64/libdpmqmihal.so and b/proprietary/vendor/lib64/libdpmqmihal.so differ
diff --git a/proprietary/vendor/lib64/libdrmfs.so b/proprietary/vendor/lib64/libdrmfs.so
index cea3378..256968e 100644
Binary files a/proprietary/vendor/lib64/libdrmfs.so and b/proprietary/vendor/lib64/libdrmfs.so differ
diff --git a/proprietary/vendor/lib64/libdrmtime.so b/proprietary/vendor/lib64/libdrmtime.so
index 8315277..6ad6599 100644
Binary files a/proprietary/vendor/lib64/libdrmtime.so and b/proprietary/vendor/lib64/libdrmtime.so differ
diff --git a/proprietary/vendor/lib64/libdsi_netctrl.so b/proprietary/vendor/lib64/libdsi_netctrl.so
index 7712053..d19d870 100644
Binary files a/proprietary/vendor/lib64/libdsi_netctrl.so and b/proprietary/vendor/lib64/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib64/libdsutils.so b/proprietary/vendor/lib64/libdsutils.so
index 209612a..44681b6 100644
Binary files a/proprietary/vendor/lib64/libdsutils.so and b/proprietary/vendor/lib64/libdsutils.so differ
diff --git a/proprietary/vendor/lib64/libfastcvdsp_stub.so b/proprietary/vendor/lib64/libfastcvdsp_stub.so
index 56cb541..6ba2677 100644
Binary files a/proprietary/vendor/lib64/libfastcvdsp_stub.so and b/proprietary/vendor/lib64/libfastcvdsp_stub.so differ
diff --git a/proprietary/vendor/lib64/libfastcvopt.so b/proprietary/vendor/lib64/libfastcvopt.so
index 0f6201e..e50813f 100644
Binary files a/proprietary/vendor/lib64/libfastcvopt.so and b/proprietary/vendor/lib64/libfastcvopt.so differ
diff --git a/proprietary/vendor/lib64/libgdtap.so b/proprietary/vendor/lib64/libgdtap.so
index 28c71f1..ebe59e8 100644
Binary files a/proprietary/vendor/lib64/libgdtap.so and b/proprietary/vendor/lib64/libgdtap.so differ
diff --git a/proprietary/vendor/lib64/libgeofencing.so b/proprietary/vendor/lib64/libgeofencing.so
index 3ae79e4..30fa146 100644
Binary files a/proprietary/vendor/lib64/libgeofencing.so and b/proprietary/vendor/lib64/libgeofencing.so differ
diff --git a/proprietary/vendor/lib64/libgnss.so b/proprietary/vendor/lib64/libgnss.so
index 1d4f064..fa962e5 100644
Binary files a/proprietary/vendor/lib64/libgnss.so and b/proprietary/vendor/lib64/libgnss.so differ
diff --git a/proprietary/vendor/lib64/libgnsspps.so b/proprietary/vendor/lib64/libgnsspps.so
index 249426d..94e1e5c 100644
Binary files a/proprietary/vendor/lib64/libgnsspps.so and b/proprietary/vendor/lib64/libgnsspps.so differ
diff --git a/proprietary/vendor/lib64/libgps.utils.so b/proprietary/vendor/lib64/libgps.utils.so
index 9f979ef..02fa880 100644
Binary files a/proprietary/vendor/lib64/libgps.utils.so and b/proprietary/vendor/lib64/libgps.utils.so differ
diff --git a/proprietary/vendor/lib64/libgpudataproducer.so b/proprietary/vendor/lib64/libgpudataproducer.so
index 8dbe2cf..b1249e1 100644
Binary files a/proprietary/vendor/lib64/libgpudataproducer.so and b/proprietary/vendor/lib64/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib64/libgsl.so b/proprietary/vendor/lib64/libgsl.so
index ea30a4a..c89662a 100644
Binary files a/proprietary/vendor/lib64/libgsl.so and b/proprietary/vendor/lib64/libgsl.so differ
diff --git a/proprietary/vendor/lib64/libhexagon_nn_stub.so b/proprietary/vendor/lib64/libhexagon_nn_stub.so
index eee6668..d2c53ff 100644
Binary files a/proprietary/vendor/lib64/libhexagon_nn_stub.so and b/proprietary/vendor/lib64/libhexagon_nn_stub.so differ
diff --git a/proprietary/vendor/lib64/libhta_hexagon_runtime.so b/proprietary/vendor/lib64/libhta_hexagon_runtime.so
index 27e952e..3edfcb4 100644
Binary files a/proprietary/vendor/lib64/libhta_hexagon_runtime.so and b/proprietary/vendor/lib64/libhta_hexagon_runtime.so differ
diff --git a/proprietary/vendor/lib64/libizat_client_api.so b/proprietary/vendor/lib64/libizat_client_api.so
index fdafead..cf53beb 100644
Binary files a/proprietary/vendor/lib64/libizat_client_api.so and b/proprietary/vendor/lib64/libizat_client_api.so differ
diff --git a/proprietary/vendor/lib64/libizat_core.so b/proprietary/vendor/lib64/libizat_core.so
index d4d7338..4bbd6fd 100644
Binary files a/proprietary/vendor/lib64/libizat_core.so and b/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/proprietary/vendor/lib64/libjnihelper.so b/proprietary/vendor/lib64/libjnihelper.so
index c530ba3..acea59a 100644
Binary files a/proprietary/vendor/lib64/libjnihelper.so and b/proprietary/vendor/lib64/libjnihelper.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterdeviceutils.so b/proprietary/vendor/lib64/libkeymasterdeviceutils.so
index 3c38299..81f0cd4 100644
Binary files a/proprietary/vendor/lib64/libkeymasterdeviceutils.so and b/proprietary/vendor/lib64/libkeymasterdeviceutils.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterprovision.so b/proprietary/vendor/lib64/libkeymasterprovision.so
index 9718a10..10d9a34 100644
Binary files a/proprietary/vendor/lib64/libkeymasterprovision.so and b/proprietary/vendor/lib64/libkeymasterprovision.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index fb4bde7..ad2afd5 100644
Binary files a/proprietary/vendor/lib64/liblbs_core.so and b/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/proprietary/vendor/lib64/liblearningmodule.so b/proprietary/vendor/lib64/liblearningmodule.so
index 63bbfa4..575e640 100644
Binary files a/proprietary/vendor/lib64/liblearningmodule.so and b/proprietary/vendor/lib64/liblearningmodule.so differ
diff --git a/proprietary/vendor/lib64/libllvm-glnext.so b/proprietary/vendor/lib64/libllvm-glnext.so
index d42bd62..a85f585 100644
Binary files a/proprietary/vendor/lib64/libllvm-glnext.so and b/proprietary/vendor/lib64/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib64/libllvm-qcom.so b/proprietary/vendor/lib64/libllvm-qcom.so
index 586959a..30fce7f 100644
Binary files a/proprietary/vendor/lib64/libllvm-qcom.so and b/proprietary/vendor/lib64/libllvm-qcom.so differ
diff --git a/proprietary/vendor/lib64/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 7f28827..c5fccbd 100644
Binary files a/proprietary/vendor/lib64/libloc_api_v02.so and b/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/proprietary/vendor/lib64/libloc_core.so b/proprietary/vendor/lib64/libloc_core.so
index 1fc7a46..64340b0 100644
Binary files a/proprietary/vendor/lib64/libloc_core.so and b/proprietary/vendor/lib64/libloc_core.so differ
diff --git a/proprietary/vendor/lib64/libloc_socket.so b/proprietary/vendor/lib64/libloc_socket.so
index b737806..9ead1cd 100644
Binary files a/proprietary/vendor/lib64/libloc_socket.so and b/proprietary/vendor/lib64/libloc_socket.so differ
diff --git a/proprietary/vendor/lib64/liblocation_api.so b/proprietary/vendor/lib64/liblocation_api.so
index be745b0..f6ed18e 100644
Binary files a/proprietary/vendor/lib64/liblocation_api.so and b/proprietary/vendor/lib64/liblocation_api.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice.so b/proprietary/vendor/lib64/liblocationservice.so
index 437fefe..902ddc3 100644
Binary files a/proprietary/vendor/lib64/liblocationservice.so and b/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice_glue.so b/proprietary/vendor/lib64/liblocationservice_glue.so
index 1403547..7267ccb 100644
Binary files a/proprietary/vendor/lib64/liblocationservice_glue.so and b/proprietary/vendor/lib64/liblocationservice_glue.so differ
diff --git a/proprietary/vendor/lib64/liblowi_client.so b/proprietary/vendor/lib64/liblowi_client.so
index cd49e52..ee747db 100644
Binary files a/proprietary/vendor/lib64/liblowi_client.so and b/proprietary/vendor/lib64/liblowi_client.so differ
diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so
index 25ac778..8989e2d 100644
Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and b/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/proprietary/vendor/lib64/liblqe.so b/proprietary/vendor/lib64/liblqe.so
index aef05bd..eaabb9e 100644
Binary files a/proprietary/vendor/lib64/liblqe.so and b/proprietary/vendor/lib64/liblqe.so differ
diff --git a/proprietary/vendor/lib64/libmdmdetect.so b/proprietary/vendor/lib64/libmdmdetect.so
index fe11f15..1b3d581 100644
Binary files a/proprietary/vendor/lib64/libmdmdetect.so and b/proprietary/vendor/lib64/libmdmdetect.so differ
diff --git a/proprietary/vendor/lib64/libmdsprpc.so b/proprietary/vendor/lib64/libmdsprpc.so
index 25bc8a9..5498964 100644
Binary files a/proprietary/vendor/lib64/libmdsprpc.so and b/proprietary/vendor/lib64/libmdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libmeters.so b/proprietary/vendor/lib64/libmeters.so
index 190192c..a4687da 100644
Binary files a/proprietary/vendor/lib64/libmeters.so and b/proprietary/vendor/lib64/libmeters.so differ
diff --git a/proprietary/vendor/lib64/libminkdescriptor.so b/proprietary/vendor/lib64/libminkdescriptor.so
index 3e53ab3..21054d1 100644
Binary files a/proprietary/vendor/lib64/libminkdescriptor.so and b/proprietary/vendor/lib64/libminkdescriptor.so differ
diff --git a/proprietary/vendor/lib64/libminksocket.so b/proprietary/vendor/lib64/libminksocket.so
index a75af84..cce1dbe 100644
Binary files a/proprietary/vendor/lib64/libminksocket.so and b/proprietary/vendor/lib64/libminksocket.so differ
diff --git a/proprietary/vendor/lib64/libmmosal.so b/proprietary/vendor/lib64/libmmosal.so
index e48f055..199381a 100644
Binary files a/proprietary/vendor/lib64/libmmosal.so and b/proprietary/vendor/lib64/libmmosal.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr.so b/proprietary/vendor/lib64/libnetmgr.so
index 20f27a6..1f4e25c 100644
Binary files a/proprietary/vendor/lib64/libnetmgr.so and b/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_common.so b/proprietary/vendor/lib64/libnetmgr_common.so
index a99276a..67b7a53 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_common.so and b/proprietary/vendor/lib64/libnetmgr_common.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_nr_fusion.so b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
index f37bb35..38ab50b 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_nr_fusion.so and b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so
index 8e1111d..3b17d1c 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so and b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so differ
diff --git a/proprietary/vendor/lib64/libnlnetmgr.so b/proprietary/vendor/lib64/libnlnetmgr.so
index b885963..b261507 100644
Binary files a/proprietary/vendor/lib64/libnlnetmgr.so and b/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/proprietary/vendor/lib64/liboemnvbk_img_helper.so b/proprietary/vendor/lib64/liboemnvbk_img_helper.so
deleted file mode 100644
index a19b46c..0000000
Binary files a/proprietary/vendor/lib64/liboemnvbk_img_helper.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libops.so b/proprietary/vendor/lib64/libops.so
index f498ca8..a13538e 100644
Binary files a/proprietary/vendor/lib64/libops.so and b/proprietary/vendor/lib64/libops.so differ
diff --git a/proprietary/vendor/lib64/libpdmapper.so b/proprietary/vendor/lib64/libpdmapper.so
index baa413f..1ffd715 100644
Binary files a/proprietary/vendor/lib64/libpdmapper.so and b/proprietary/vendor/lib64/libpdmapper.so differ
diff --git a/proprietary/vendor/lib64/libpdnotifier.so b/proprietary/vendor/lib64/libpdnotifier.so
index a98acb4..487e856 100644
Binary files a/proprietary/vendor/lib64/libpdnotifier.so and b/proprietary/vendor/lib64/libpdnotifier.so differ
diff --git a/proprietary/vendor/lib64/libperfconfig.so b/proprietary/vendor/lib64/libperfconfig.so
index d39cfb3..bb5a2cb 100644
Binary files a/proprietary/vendor/lib64/libperfconfig.so and b/proprietary/vendor/lib64/libperfconfig.so differ
diff --git a/proprietary/vendor/lib64/libperfgluelayer.so b/proprietary/vendor/lib64/libperfgluelayer.so
index 86cfd14..c9261af 100644
Binary files a/proprietary/vendor/lib64/libperfgluelayer.so and b/proprietary/vendor/lib64/libperfgluelayer.so differ
diff --git a/proprietary/vendor/lib64/libperipheral_client.so b/proprietary/vendor/lib64/libperipheral_client.so
index d75109e..372d534 100644
Binary files a/proprietary/vendor/lib64/libperipheral_client.so and b/proprietary/vendor/lib64/libperipheral_client.so differ
diff --git a/proprietary/vendor/lib64/libqcbor.so b/proprietary/vendor/lib64/libqcbor.so
index 600e641..ff28879 100644
Binary files a/proprietary/vendor/lib64/libqcbor.so and b/proprietary/vendor/lib64/libqcbor.so differ
diff --git a/proprietary/vendor/lib64/libqcc_file_agent.so b/proprietary/vendor/lib64/libqcc_file_agent.so
index 1d912c6..4e43134 100644
Binary files a/proprietary/vendor/lib64/libqcc_file_agent.so and b/proprietary/vendor/lib64/libqcc_file_agent.so differ
diff --git a/proprietary/vendor/lib64/libqcmaputils.so b/proprietary/vendor/lib64/libqcmaputils.so
index d8fa154..5b9541a 100644
Binary files a/proprietary/vendor/lib64/libqcmaputils.so and b/proprietary/vendor/lib64/libqcmaputils.so differ
diff --git a/proprietary/vendor/lib64/libqcrilFramework.so b/proprietary/vendor/lib64/libqcrilFramework.so
index 05123a1..b0877f6 100644
Binary files a/proprietary/vendor/lib64/libqcrilFramework.so and b/proprietary/vendor/lib64/libqcrilFramework.so differ
diff --git a/proprietary/vendor/lib64/libqcrildatactl.so b/proprietary/vendor/lib64/libqcrildatactl.so
index c69dd03..5934ae5 100644
Binary files a/proprietary/vendor/lib64/libqcrildatactl.so and b/proprietary/vendor/lib64/libqcrildatactl.so differ
diff --git a/proprietary/vendor/lib64/libqdi.so b/proprietary/vendor/lib64/libqdi.so
index ff89f8e..79de6d3 100644
Binary files a/proprietary/vendor/lib64/libqdi.so and b/proprietary/vendor/lib64/libqdi.so differ
diff --git a/proprietary/vendor/lib64/libqdma_file_agent.so b/proprietary/vendor/lib64/libqdma_file_agent.so
index 52459ea..682027e 100644
Binary files a/proprietary/vendor/lib64/libqdma_file_agent.so and b/proprietary/vendor/lib64/libqdma_file_agent.so differ
diff --git a/proprietary/vendor/lib64/libqdp.so b/proprietary/vendor/lib64/libqdp.so
index e4f01e7..28f5faa 100644
Binary files a/proprietary/vendor/lib64/libqdp.so and b/proprietary/vendor/lib64/libqdp.so differ
diff --git a/proprietary/vendor/lib64/libqisl.so b/proprietary/vendor/lib64/libqisl.so
index 73fe4f5..e0edd58 100644
Binary files a/proprietary/vendor/lib64/libqisl.so and b/proprietary/vendor/lib64/libqisl.so differ
diff --git a/proprietary/vendor/lib64/libqmi.so b/proprietary/vendor/lib64/libqmi.so
index 32ae9a2..51cf082 100644
Binary files a/proprietary/vendor/lib64/libqmi.so and b/proprietary/vendor/lib64/libqmi.so differ
diff --git a/proprietary/vendor/lib64/libqmi_cci.so b/proprietary/vendor/lib64/libqmi_cci.so
index 253fe41..8b45a3e 100644
Binary files a/proprietary/vendor/lib64/libqmi_cci.so and b/proprietary/vendor/lib64/libqmi_cci.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_helper.so b/proprietary/vendor/lib64/libqmi_client_helper.so
index 9923551..7bf9e70 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_helper.so and b/proprietary/vendor/lib64/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_qmux.so b/proprietary/vendor/lib64/libqmi_client_qmux.so
index 5bff3bf..bd6852b 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_qmux.so and b/proprietary/vendor/lib64/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib64/libqmi_csi.so b/proprietary/vendor/lib64/libqmi_csi.so
index 5bf342f..bc0ba89 100644
Binary files a/proprietary/vendor/lib64/libqmi_csi.so and b/proprietary/vendor/lib64/libqmi_csi.so differ
diff --git a/proprietary/vendor/lib64/libqmiservices.so b/proprietary/vendor/lib64/libqmiservices.so
index 91f5bee..eee7114 100644
Binary files a/proprietary/vendor/lib64/libqmiservices.so and b/proprietary/vendor/lib64/libqmiservices.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd-client.so b/proprietary/vendor/lib64/libqti-perfd-client.so
index 66597d5..365bd65 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd-client.so and b/proprietary/vendor/lib64/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd.so b/proprietary/vendor/lib64/libqti-perfd.so
index 99b90ef..9832d43 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd.so and b/proprietary/vendor/lib64/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib64/libqti-util.so b/proprietary/vendor/lib64/libqti-util.so
index 0bc4fcd..ff43dd1 100644
Binary files a/proprietary/vendor/lib64/libqti-util.so and b/proprietary/vendor/lib64/libqti-util.so differ
diff --git a/proprietary/vendor/lib64/libqtikeymaster4.so b/proprietary/vendor/lib64/libqtikeymaster4.so
index 4ca2f40..82f463f 100644
Binary files a/proprietary/vendor/lib64/libqtikeymaster4.so and b/proprietary/vendor/lib64/libqtikeymaster4.so differ
diff --git a/proprietary/vendor/lib64/librcc.so b/proprietary/vendor/lib64/librcc.so
index b203ec0..eaf23fa 100644
Binary files a/proprietary/vendor/lib64/librcc.so and b/proprietary/vendor/lib64/librcc.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-hal-qmi.so b/proprietary/vendor/lib64/libril-qc-hal-qmi.so
index ea99d67..bbaf825 100644
Binary files a/proprietary/vendor/lib64/libril-qc-hal-qmi.so and b/proprietary/vendor/lib64/libril-qc-hal-qmi.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-logger.so b/proprietary/vendor/lib64/libril-qc-logger.so
index 46603d9..c221011 100644
Binary files a/proprietary/vendor/lib64/libril-qc-logger.so and b/proprietary/vendor/lib64/libril-qc-logger.so differ
diff --git a/proprietary/vendor/lib64/librilqmiservices.so b/proprietary/vendor/lib64/librilqmiservices.so
index 56ac9d3..2618828 100644
Binary files a/proprietary/vendor/lib64/librilqmiservices.so and b/proprietary/vendor/lib64/librilqmiservices.so differ
diff --git a/proprietary/vendor/lib64/librpmb.so b/proprietary/vendor/lib64/librpmb.so
index d5a6137..85a6065 100644
Binary files a/proprietary/vendor/lib64/librpmb.so and b/proprietary/vendor/lib64/librpmb.so differ
diff --git a/proprietary/vendor/lib64/libscveCommon.so b/proprietary/vendor/lib64/libscveCommon.so
index 3895253..ac5f8bb 100644
Binary files a/proprietary/vendor/lib64/libscveCommon.so and b/proprietary/vendor/lib64/libscveCommon.so differ
diff --git a/proprietary/vendor/lib64/libscveCommon_stub.so b/proprietary/vendor/lib64/libscveCommon_stub.so
index 4e656ef..4196fdc 100644
Binary files a/proprietary/vendor/lib64/libscveCommon_stub.so and b/proprietary/vendor/lib64/libscveCommon_stub.so differ
diff --git a/proprietary/vendor/lib64/libscveObjectSegmentation.so b/proprietary/vendor/lib64/libscveObjectSegmentation.so
index 1dfd3dd..399d3b1 100644
Binary files a/proprietary/vendor/lib64/libscveObjectSegmentation.so and b/proprietary/vendor/lib64/libscveObjectSegmentation.so differ
diff --git a/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so b/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so
index eff9f6f..5a5d865 100644
Binary files a/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so and b/proprietary/vendor/lib64/libscveObjectSegmentation_stub.so differ
diff --git a/proprietary/vendor/lib64/libscveObjectTracker.so b/proprietary/vendor/lib64/libscveObjectTracker.so
index 626b920..a7f2fd6 100644
Binary files a/proprietary/vendor/lib64/libscveObjectTracker.so and b/proprietary/vendor/lib64/libscveObjectTracker.so differ
diff --git a/proprietary/vendor/lib64/libscveObjectTracker_stub.so b/proprietary/vendor/lib64/libscveObjectTracker_stub.so
index 71b26a9..ede10d1 100644
Binary files a/proprietary/vendor/lib64/libscveObjectTracker_stub.so and b/proprietary/vendor/lib64/libscveObjectTracker_stub.so differ
diff --git a/proprietary/vendor/lib64/libsdsprpc.so b/proprietary/vendor/lib64/libsdsprpc.so
index 1f7f6cb..fd74a5f 100644
Binary files a/proprietary/vendor/lib64/libsdsprpc.so and b/proprietary/vendor/lib64/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libsecureui.so b/proprietary/vendor/lib64/libsecureui.so
index 3ac7b78..587ff68 100644
Binary files a/proprietary/vendor/lib64/libsecureui.so and b/proprietary/vendor/lib64/libsecureui.so differ
diff --git a/proprietary/vendor/lib64/libsettings.so b/proprietary/vendor/lib64/libsettings.so
index 16e018a..4b229dc 100644
Binary files a/proprietary/vendor/lib64/libsettings.so and b/proprietary/vendor/lib64/libsettings.so differ
diff --git a/proprietary/vendor/lib64/libslimclient.so b/proprietary/vendor/lib64/libslimclient.so
index 1cfd9bb..73aceea 100644
Binary files a/proprietary/vendor/lib64/libslimclient.so and b/proprietary/vendor/lib64/libslimclient.so differ
diff --git a/proprietary/vendor/lib64/libsoc_helper.so b/proprietary/vendor/lib64/libsoc_helper.so
index 9cacac8..50ad39d 100644
Binary files a/proprietary/vendor/lib64/libsoc_helper.so and b/proprietary/vendor/lib64/libsoc_helper.so differ
diff --git a/proprietary/vendor/lib64/libssd.so b/proprietary/vendor/lib64/libssd.so
index 867ae3c..8e02047 100644
Binary files a/proprietary/vendor/lib64/libssd.so and b/proprietary/vendor/lib64/libssd.so differ
diff --git a/proprietary/vendor/lib64/libswvdec.so b/proprietary/vendor/lib64/libswvdec.so
index 634ca2f..a3e5ace 100644
Binary files a/proprietary/vendor/lib64/libswvdec.so and b/proprietary/vendor/lib64/libswvdec.so differ
diff --git a/proprietary/vendor/lib64/libsysmon_cdsp_skel.so b/proprietary/vendor/lib64/libsysmon_cdsp_skel.so
index e27a031..116ad43 100644
Binary files a/proprietary/vendor/lib64/libsysmon_cdsp_skel.so and b/proprietary/vendor/lib64/libsysmon_cdsp_skel.so differ
diff --git a/proprietary/vendor/lib64/libsystem_health_mon.so b/proprietary/vendor/lib64/libsystem_health_mon.so
index b8a3b39..a705d17 100644
Binary files a/proprietary/vendor/lib64/libsystem_health_mon.so and b/proprietary/vendor/lib64/libsystem_health_mon.so differ
diff --git a/proprietary/vendor/lib64/libvpphcp.so b/proprietary/vendor/lib64/libvpphcp.so
index 0826ee2..4fea568 100644
Binary files a/proprietary/vendor/lib64/libvpphcp.so and b/proprietary/vendor/lib64/libvpphcp.so differ
diff --git a/proprietary/vendor/lib64/libvpphvx.so b/proprietary/vendor/lib64/libvpphvx.so
index 28745d1..a0676e5 100644
Binary files a/proprietary/vendor/lib64/libvpphvx.so and b/proprietary/vendor/lib64/libvpphvx.so differ
diff --git a/proprietary/vendor/lib64/libvpplibrary.so b/proprietary/vendor/lib64/libvpplibrary.so
index 06c1df5..051e35d 100644
Binary files a/proprietary/vendor/lib64/libvpplibrary.so and b/proprietary/vendor/lib64/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib64/libwms.so b/proprietary/vendor/lib64/libwms.so
index a7fa10c..85f8846 100644
Binary files a/proprietary/vendor/lib64/libwms.so and b/proprietary/vendor/lib64/libwms.so differ
diff --git a/proprietary/vendor/lib64/libwqe.so b/proprietary/vendor/lib64/libwqe.so
index 03d1259..60ff9c9 100644
Binary files a/proprietary/vendor/lib64/libwqe.so and b/proprietary/vendor/lib64/libwqe.so differ
diff --git a/proprietary/vendor/lib64/libxml.so b/proprietary/vendor/lib64/libxml.so
index 0a15721..4806891 100644
Binary files a/proprietary/vendor/lib64/libxml.so and b/proprietary/vendor/lib64/libxml.so differ
diff --git a/proprietary/vendor/lib64/libxtadapter.so b/proprietary/vendor/lib64/libxtadapter.so
index e1f9e2a..9567a4f 100644
Binary files a/proprietary/vendor/lib64/libxtadapter.so and b/proprietary/vendor/lib64/libxtadapter.so differ
diff --git a/proprietary/vendor/lib64/qtibus.so b/proprietary/vendor/lib64/qtibus.so
index cf9be58..cff0bad 100644
Binary files a/proprietary/vendor/lib64/qtibus.so and b/proprietary/vendor/lib64/qtibus.so differ
diff --git a/proprietary/vendor/lib64/qtimutex.so b/proprietary/vendor/lib64/qtimutex.so
index 7fc8834..ef91016 100644
Binary files a/proprietary/vendor/lib64/qtimutex.so and b/proprietary/vendor/lib64/qtimutex.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-adreno.so b/proprietary/vendor/lib64/unnhal-acc-adreno.so
index 1834f3a..72c3d29 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-adreno.so and b/proprietary/vendor/lib64/unnhal-acc-adreno.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-common.so b/proprietary/vendor/lib64/unnhal-acc-common.so
index 9c12446..8fb9d10 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-common.so and b/proprietary/vendor/lib64/unnhal-acc-common.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-hta.so b/proprietary/vendor/lib64/unnhal-acc-hta.so
index 656d906..e5263ed 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-hta.so and b/proprietary/vendor/lib64/unnhal-acc-hta.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-hvx.so b/proprietary/vendor/lib64/unnhal-acc-hvx.so
index 060b3e8..7c91099 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-hvx.so and b/proprietary/vendor/lib64/unnhal-acc-hvx.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so b/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so
index 496c5c4..0ab3241 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so and b/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so b/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so
index f71de5b..4e0ca3b 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so and b/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so b/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so
index a852f81..b4d822f 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so and b/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so b/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so
new file mode 100644
index 0000000..e34fd3b
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so b/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so
index e6e98b0..0507fd9 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so and b/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so b/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so
index 7f9df41..ba24753 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so
index 48988b7..0b288fd 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so
index 9f5d6fa..36b5715 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so
index 3aae8f9..6b064f7 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so
index 45400d6..0205638 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so b/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so
index 32879ab..12c05cf 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so and b/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so
index 34e2a65..e048e1c 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so
index cf2a3b9..e75954b 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so and b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so
index ef0f0b4..74e9aec 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so
index 75b387b..daa59a2 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
index 3abf85e..7bd382d 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
index 1255c03..fa95726 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so
index 8252b88..08e1dca 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so
index bd4e6f5..7a294fb 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
index 0060af3..7009a95 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
index a21bb8b..12e3392 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so
index d01a070..a283de0 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so
index af60642..48339c7 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so
index 235fc0e..6e07402 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so
index e8c9c59..e2754d1 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so
index ef9dcc0..b32fb9c 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so
index efef879..f70f5b2 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
index 4cde327..e98b55a 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so
index 875fe98..5632a6e 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so
index e3dc9e3..8a17789 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so
index 9c077b6..3f80a2f 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
index f4832fb..a815837 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
index bf46b37..f3d09d1 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so
index 1b90e62..25f5c9d 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
index 40c733c..c3d93c2 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
index 41261f5..6c11aef 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so
index 2709f67..9074ba6 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so
index 33a0970..af575da 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so
index ea7a101..e73b48e 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so
index 6a4b4ba..134930e 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so
index 85f74fe..13ac659 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so
index cd0aa02..ee55106 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so
index fc8f1ce..6191474 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so
new file mode 100644
index 0000000..f5efb8d
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
index f7ea170..98c99cb 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
index 48559c4..dabb8ab 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so
index 1ea1631..ffb8704 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so
new file mode 100644
index 0000000..d2b82f0
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
index 2785b09..5da73cd 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
index 31be23f..8aad6ea 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
index 2a25ad5..ecba137 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so
index 3c3001f..4917f6b 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so
index aff893d..7790f97 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so
index b0db844..8f87d29 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so
index d4cd8b0..b6388c0 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so
index 0a07e20..4f2356f 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so
index 49ada0b..340201f 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so
index ec3f972..c4513c6 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so
index 340beb3..e268093 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
index a96b179..ba32b83 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so
index c0e5c21..1f524e1 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so
index bacbd49..721fe7a 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
index 4c3eeb7..d37e769 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so
index a91c214..59769db 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so
index 69985fc..8d47f90 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
index 6c1ff8e..20434c6 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so
index 8e68ccc..7ddc58a 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so and b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so
index 0b65305..4dbbce1 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so and b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so
index e664dba..f088d2d 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so and b/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so
index 2e9841d..8a9e790 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so and b/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so
index 2f99376..b94b866 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so and b/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so
index 8dcdf46..8fd6b09 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so and b/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so b/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so
new file mode 100644
index 0000000..f11ecdd
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
index 8309c0d..cfc8243 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so and b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so
index 1503674..17f9f79 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so and b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so
index 6fb7d31..be41b10 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so and b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
index f3708c1..a332390 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so and b/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
index cf2ac42..27bc2ca 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so and b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so
index 2c74237..90eeb66 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so and b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.latency@2.0.so b/proprietary/vendor/lib64/vendor.qti.latency@2.0.so
index ab05dfb..1e40c61 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.latency@2.0.so and b/proprietary/vendor/lib64/vendor.qti.latency@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.latency@2.1.so b/proprietary/vendor/lib64/vendor.qti.latency@2.1.so
index 21215a5..232d2da 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.latency@2.1.so and b/proprietary/vendor/lib64/vendor.qti.latency@2.1.so differ
diff --git a/proprietary/vendor/radio/qcril_database/qcril.db b/proprietary/vendor/radio/qcril_database/qcril.db
index a43cbca..ab3485d 100644
Binary files a/proprietary/vendor/radio/qcril_database/qcril.db and b/proprietary/vendor/radio/qcril_database/qcril.db differ