diff --git a/Android.bp b/Android.bp
index cf16d17..dd94721 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1113,53 +1113,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libhdr_tm",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libhdr_tm.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libsdm-color",
-                "libtinyxml2_1",
-                "libcutils",
-                "libutils",
-                "libbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libhdr_tm.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libsdm-color",
-                "libtinyxml2_1",
-                "libcutils",
-                "libutils",
-                "libbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libidl",
     owner: "xiaomi",
@@ -2024,41 +1977,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libqseed3",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libqseed3.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libqseed3.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "librs_adreno",
     owner: "xiaomi",
@@ -2102,217 +2020,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsdedrm",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsdedrm.so",
-            ],
-            shared_libs: [
-                "libdrm",
-                "libdrmutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsdedrm.so",
-            ],
-            shared_libs: [
-                "libdrm",
-                "libdrmutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsdm-color",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsdm-color.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libbinder",
-                "libutils",
-                "libsdmutils",
-                "libtinyxml2_1",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsdm-color.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libbinder",
-                "libutils",
-                "libsdmutils",
-                "libtinyxml2_1",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsdm-diag",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsdm-diag.so",
-            ],
-            shared_libs: [
-                "libdiag",
-                "libsdmutils",
-                "libbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsdm-diag.so",
-            ],
-            shared_libs: [
-                "libdiag",
-                "libsdmutils",
-                "libbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsdm-disp-vndapis",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsdm-disp-vndapis.so",
-            ],
-            shared_libs: [
-                "libsdmutils",
-                "libqservice",
-                "libbinder",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsdm-disp-vndapis.so",
-            ],
-            shared_libs: [
-                "libsdmutils",
-                "libqservice",
-                "libbinder",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsdmextension",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsdmextension.so",
-            ],
-            shared_libs: [
-                "libsdmutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsdmextension.so",
-            ],
-            shared_libs: [
-                "libsdmutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libsdsprpc",
     owner: "xiaomi",
@@ -2467,40 +2174,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "btaudio_offload_if",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/btaudio_offload_if.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libfmq",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "android.hardware.bluetooth.audio@2.0",
-                "libbluetooth_audio_session",
-                "libbluetooth_audio_session_qti",
-                "libbluetooth_audio_session_qti_2_1",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "sound_trigger.primary.sdm660",
     owner: "xiaomi",
@@ -2532,40 +2205,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.bluetooth_audio@2.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so",
-            ],
-            shared_libs: [
-                "android.hardware.audio.common@5.0",
-                "vendor.qti.hardware.bluetooth_audio@2.0",
-                "libbase",
-                "libbluetooth_audio_session_qti",
-                "libcutils",
-                "libfmq",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libacdb-fts",
     owner: "xiaomi",
@@ -2760,72 +2399,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libbluetooth_audio_session_qti",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libbluetooth_audio_session_qti.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.bluetooth_audio@2.0",
-                "libaudioutils",
-                "libbase",
-                "libcutils",
-                "libfmq",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libbluetooth_audio_session_qti_2_1",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.bluetooth_audio@2.1",
-                "vendor.qti.hardware.bluetooth_audio@2.0",
-                "libaudioutils",
-                "libbase",
-                "libcutils",
-                "libfmq",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libgcs-calwrapper",
     owner: "xiaomi",
@@ -3376,6 +2949,7 @@ cc_prebuilt_library_shared {
                 "libqmi_cci",
                 "libbtnv",
                 "android.hardware.bluetooth@1.0",
+                "libsoc_helper",
                 "libc++",
                 "libc",
                 "libm",
@@ -3503,103 +3077,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.bluetooth_sar@1.1-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libutils",
-                "liblog",
-                "libbase",
-                "libcutils",
-                "vendor.qti.hardware.bluetooth_sar@1.0",
-                "vendor.qti.hardware.bluetooth_sar@1.1",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.btconfigstore@1.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "vendor.qti.hardware.btconfigstore@1.0",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.btconfigstore@2.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "vendor.qti.hardware.btconfigstore@2.0",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.soter@1.0-impl",
     owner: "xiaomi",
@@ -4134,36 +3611,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libSecureUILib",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libSecureUILib.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libStDrvInt",
-                "libQSEEComAPI",
-                "libsecureui_svcsock",
-                "libhidlbase",
-                "libbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libStDrvInt",
     owner: "xiaomi",
@@ -4569,6 +4016,36 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libhdr_tm",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libhdr_tm.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libsdm-color",
+                "libtinyxml2_1",
+                "libcutils",
+                "libutils",
+                "libbinder",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libizat_client_api",
     owner: "xiaomi",
@@ -5339,6 +4816,30 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libqseed3",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libqseed3.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libqsocket",
     owner: "xiaomi",
@@ -5622,6 +5123,152 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsdm-color",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsdm-color.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libbinder",
+                "libutils",
+                "libsdmutils",
+                "libtinyxml2_1",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsdm-diag",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsdm-diag.so",
+            ],
+            shared_libs: [
+                "libdiag",
+                "libsdmutils",
+                "libbinder",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsdm-disp-vndapis",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsdm-disp-vndapis.so",
+            ],
+            shared_libs: [
+                "libsdmutils",
+                "libqservice",
+                "libbinder",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsdmextension",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsdmextension.so",
+            ],
+            shared_libs: [
+                "libsdmutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libsecureui",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsecureui.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "liblog",
+                "libQSEEComAPI",
+                "libStDrvInt",
+                "libhidlbase",
+                "libbinder",
+                "libdisplayconfig.qti",
+                "libion",
+                "libsecureui_svcsock",
+                "vendor.display.config@1.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsecureui_svcsock",
     owner: "xiaomi",
@@ -5710,6 +5357,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsoc_helper",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsoc_helper.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libssd",
     owner: "xiaomi",
@@ -6066,65 +5738,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.display.color@1.1",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.display.color@1.1.so",
-            ],
-            shared_libs: [
-                "vendor.display.color@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.display.color@1.2",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.display.color@1.2.so",
-            ],
-            shared_libs: [
-                "vendor.display.color@1.0",
-                "vendor.display.color@1.1",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.display.postproc@1.0",
     owner: "xiaomi",
@@ -8073,7 +7686,7 @@ cc_prebuilt_library_shared {
 }
 
 prebuilt_rfsa {
-    name: "dirac_resource",
+    name: "vendor_lib_rfsa_adsp_dirac_resource_dar",
     filename: "dirac_resource.dar",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/dirac_resource.dar",
@@ -8082,7 +7695,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libFastRPC_AUE_Forward_skel",
+    name: "vendor_lib_rfsa_adsp_libFastRPC_AUE_Forward_skel_so",
     filename: "libFastRPC_AUE_Forward_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so",
@@ -8091,7 +7704,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libFastRPC_UTF_Forward_800h_skel",
+    name: "vendor_lib_rfsa_adsp_libFastRPC_UTF_Forward_800h_skel_so",
     filename: "libFastRPC_UTF_Forward_800h_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libFastRPC_UTF_Forward_800h_skel.so",
@@ -8100,7 +7713,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libFastRPC_UTF_Forward_Qtc2_skel",
+    name: "vendor_lib_rfsa_adsp_libFastRPC_UTF_Forward_Qtc2_skel_so",
     filename: "libFastRPC_UTF_Forward_Qtc2_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libFastRPC_UTF_Forward_Qtc2_skel.so",
@@ -8109,7 +7722,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_fd_skel",
+    name: "vendor_lib_rfsa_adsp_libadsp_fd_skel_so",
     filename: "libadsp_fd_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_fd_skel.so",
@@ -8118,7 +7731,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_hvx_add_constant",
+    name: "vendor_lib_rfsa_adsp_libadsp_hvx_add_constant_so",
     filename: "libadsp_hvx_add_constant.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_hvx_add_constant.so",
@@ -8127,7 +7740,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_hvx_skel",
+    name: "vendor_lib_rfsa_adsp_libadsp_hvx_skel_so",
     filename: "libadsp_hvx_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_hvx_skel.so",
@@ -8136,7 +7749,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libapps_mem_heap",
+    name: "vendor_lib_rfsa_adsp_libapps_mem_heap_so",
     filename: "libapps_mem_heap.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so",
@@ -8145,7 +7758,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libdirac-capiv2",
+    name: "vendor_lib_rfsa_adsp_libdirac-capiv2_so",
     filename: "libdirac-capiv2.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libdirac-capiv2.so",
@@ -8154,7 +7767,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libdspCV_skel",
+    name: "vendor_lib_rfsa_adsp_libdspCV_skel_so",
     filename: "libdspCV_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so",
@@ -8163,7 +7776,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libfastcvadsp",
+    name: "vendor_lib_rfsa_adsp_libfastcvadsp_so",
     filename: "libfastcvadsp.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so",
@@ -8172,7 +7785,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libfastcvadsp_skel",
+    name: "vendor_lib_rfsa_adsp_libfastcvadsp_skel_so",
     filename: "libfastcvadsp_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libfastcvadsp_skel.so",
@@ -8181,7 +7794,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libscveBlobDescriptor_skel",
+    name: "vendor_lib_rfsa_adsp_libscveBlobDescriptor_skel_so",
     filename: "libscveBlobDescriptor_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so",
@@ -8190,7 +7803,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libscveObjectSegmentation_skel",
+    name: "vendor_lib_rfsa_adsp_libscveObjectSegmentation_skel_so",
     filename: "libscveObjectSegmentation_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so",
@@ -8199,7 +7812,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libscveT2T_skel",
+    name: "vendor_lib_rfsa_adsp_libscveT2T_skel_so",
     filename: "libscveT2T_skel.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so",
@@ -9199,8 +8812,6 @@ cc_prebuilt_binary {
                 "libhardware_legacy",
                 "libhardware",
                 "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
                 "vendor.display.color@1.0",
                 "vendor.display.postproc@1.0",
                 "libsdm-disp-vndapis",
@@ -9592,7 +9203,7 @@ cc_prebuilt_binary {
                 "libhidlbase",
                 "libhidltransport",
                 "android.frameworks.sensorservice@1.0",
-                "libtinyxml",
+                "libtinyxml2",
                 "libc++",
                 "libc",
                 "libm",
@@ -10172,48 +9783,6 @@ install_symlink {
     symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
 }
 
-install_symlink {
-    name: "vendor_lib_libEGL_adreno_so",
-    soc_specific: true,
-    installed_location: "lib/libEGL_adreno.so",
-    symlink_target: "/vendor/lib/egl/libEGL_adreno.so",
-}
-
-install_symlink {
-    name: "vendor_lib_libGLESv2_adreno_so",
-    soc_specific: true,
-    installed_location: "lib/libGLESv2_adreno.so",
-    symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so",
-}
-
-install_symlink {
-    name: "vendor_lib_libq3dtools_adreno_so",
-    soc_specific: true,
-    installed_location: "lib/libq3dtools_adreno.so",
-    symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so",
-}
-
-install_symlink {
-    name: "vendor_lib64_libEGL_adreno_so",
-    soc_specific: true,
-    installed_location: "lib64/libEGL_adreno.so",
-    symlink_target: "/vendor/lib64/egl/libEGL_adreno.so",
-}
-
-install_symlink {
-    name: "vendor_lib64_libGLESv2_adreno_so",
-    soc_specific: true,
-    installed_location: "lib64/libGLESv2_adreno.so",
-    symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so",
-}
-
-install_symlink {
-    name: "vendor_lib64_libq3dtools_adreno_so",
-    soc_specific: true,
-    installed_location: "lib64/libq3dtools_adreno.so",
-    symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.fm@1.0-impl",
     owner: "xiaomi",
diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
old mode 100644
new mode 100755
index 1661859..307fcec
Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti differ
diff --git a/proprietary/vendor/bin/hw/vendor.display.color@1.0-service b/proprietary/vendor/bin/hw/vendor.display.color@1.0-service
old mode 100644
new mode 100755
index 6c1ff75..bfd1e44
Binary files a/proprietary/vendor/bin/hw/vendor.display.color@1.0-service and b/proprietary/vendor/bin/hw/vendor.display.color@1.0-service differ
diff --git a/proprietary/vendor/bin/mm-pp-dpps b/proprietary/vendor/bin/mm-pp-dpps
index 6034cff..756d254 100755
Binary files a/proprietary/vendor/bin/mm-pp-dpps and b/proprietary/vendor/bin/mm-pp-dpps differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
index e73d9b0..06cde6d 100755
Binary files a/proprietary/vendor/bin/qseecomd and b/proprietary/vendor/bin/qseecomd differ
diff --git a/proprietary/vendor/etc/init/qseecomd.rc b/proprietary/vendor/etc/init/qseecomd.rc
new file mode 100644
index 0000000..4ba5c36
--- /dev/null
+++ b/proprietary/vendor/etc/init/qseecomd.rc
@@ -0,0 +1,16 @@
+# Copyright (c) 2019, 2022 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+on init
+    wait /dev/qseecom
+    start vendor.qseecomd
+
+on property:vendor.keymaster.quickboot=true
+   stop vendor.qseecomd
+   start vendor.qseecomd
+
+service vendor.qseecomd /vendor/bin/qseecomd
+    class core
+    user root
+    group root
diff --git a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so
index e2bf784..d2ffd15 100644
Binary files a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so and b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so differ
diff --git a/proprietary/vendor/lib/egl/libEGL_adreno.so b/proprietary/vendor/lib/egl/libEGL_adreno.so
index e0df5aa..0420fd2 100644
Binary files a/proprietary/vendor/lib/egl/libEGL_adreno.so and b/proprietary/vendor/lib/egl/libEGL_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so b/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so
index a420012..b5ed380 100644
Binary files a/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so and b/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/proprietary/vendor/lib/egl/libGLESv2_adreno.so
index b910765..c6e4189 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_adreno.so b/proprietary/vendor/lib/egl/libq3dtools_adreno.so
index 30de8d0..c8b1e9e 100644
Binary files a/proprietary/vendor/lib/egl/libq3dtools_adreno.so and b/proprietary/vendor/lib/egl/libq3dtools_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libq3dtools_esx.so b/proprietary/vendor/lib/egl/libq3dtools_esx.so
index ef4eb7b..0f90101 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/vulkan.adreno.so b/proprietary/vendor/lib/hw/vulkan.adreno.so
index 2dd2e60..b0d284d 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/libC2D2.so b/proprietary/vendor/lib/libC2D2.so
index 087cd0e..57bf037 100644
Binary files a/proprietary/vendor/lib/libC2D2.so and b/proprietary/vendor/lib/libC2D2.so differ
diff --git a/proprietary/vendor/lib/libCB.so b/proprietary/vendor/lib/libCB.so
index 6627527..c0fd51f 100644
Binary files a/proprietary/vendor/lib/libCB.so and b/proprietary/vendor/lib/libCB.so differ
diff --git a/proprietary/vendor/lib/libOpenCL.so b/proprietary/vendor/lib/libOpenCL.so
index cdfdb40..9d8ca0c 100644
Binary files a/proprietary/vendor/lib/libOpenCL.so and b/proprietary/vendor/lib/libOpenCL.so differ
diff --git a/proprietary/vendor/lib/libQSEEComAPI.so b/proprietary/vendor/lib/libQSEEComAPI.so
index eda2d22..1c88614 100644
Binary files a/proprietary/vendor/lib/libQSEEComAPI.so and b/proprietary/vendor/lib/libQSEEComAPI.so differ
diff --git a/proprietary/vendor/lib/libVkLayer_q3dtools.so b/proprietary/vendor/lib/libVkLayer_q3dtools.so
index 4ffdd7f..83dddb4 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 eccac02..0df2a03 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/libc2d30_bltlib.so b/proprietary/vendor/lib/libc2d30_bltlib.so
index 4c85e83..58022c1 100644
Binary files a/proprietary/vendor/lib/libc2d30_bltlib.so and b/proprietary/vendor/lib/libc2d30_bltlib.so differ
diff --git a/proprietary/vendor/lib/libgpudataproducer.so b/proprietary/vendor/lib/libgpudataproducer.so
index 11e9a7d..96a2552 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 a963e7e..d1968bd 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 6846dd7..1a74dcd 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 b9461b6..ff14eb0 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/librs_adreno.so b/proprietary/vendor/lib/librs_adreno.so
index 8a8cfc5..095c3fa 100644
Binary files a/proprietary/vendor/lib/librs_adreno.so and b/proprietary/vendor/lib/librs_adreno.so differ
diff --git a/proprietary/vendor/lib/libtinyxml2_1.so b/proprietary/vendor/lib/libtinyxml2_1.so
index d0998a7..5283c09 100644
Binary files a/proprietary/vendor/lib/libtinyxml2_1.so and b/proprietary/vendor/lib/libtinyxml2_1.so differ
diff --git a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so
index ea4449b..1545166 100644
Binary files a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so and b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so differ
diff --git a/proprietary/vendor/lib64/egl/libEGL_adreno.so b/proprietary/vendor/lib64/egl/libEGL_adreno.so
index c725ece..3660820 100644
Binary files a/proprietary/vendor/lib64/egl/libEGL_adreno.so and b/proprietary/vendor/lib64/egl/libEGL_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so b/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so
index 1cbf19a..f19536d 100644
Binary files a/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so and b/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so
index 2f77545..9d60064 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_adreno.so b/proprietary/vendor/lib64/egl/libq3dtools_adreno.so
index 7aa77f9..c835a44 100644
Binary files a/proprietary/vendor/lib64/egl/libq3dtools_adreno.so and b/proprietary/vendor/lib64/egl/libq3dtools_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libq3dtools_esx.so b/proprietary/vendor/lib64/egl/libq3dtools_esx.so
index 60078eb..633710b 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 488cf66..43b6e01 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/com.dsi.ant@1.0-impl.so b/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so
index 8452e82..552c1a8 100644
Binary files a/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so and b/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
index 2a960b4..5ba26b0 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/libC2D2.so b/proprietary/vendor/lib64/libC2D2.so
index 9eac1f5..aed2497 100644
Binary files a/proprietary/vendor/lib64/libC2D2.so and b/proprietary/vendor/lib64/libC2D2.so differ
diff --git a/proprietary/vendor/lib64/libCB.so b/proprietary/vendor/lib64/libCB.so
index bcb8d25..c941bde 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel.so b/proprietary/vendor/lib64/libGPreqcancel.so
index 647b1e8..fbf8756 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 9dda51c..5b51148 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/libOpenCL.so b/proprietary/vendor/lib64/libOpenCL.so
index 19e7753..6881dcf 100644
Binary files a/proprietary/vendor/lib64/libOpenCL.so and b/proprietary/vendor/lib64/libOpenCL.so differ
diff --git a/proprietary/vendor/lib64/libQSEEComAPI.so b/proprietary/vendor/lib64/libQSEEComAPI.so
index 777a604..7d2cedb 100644
Binary files a/proprietary/vendor/lib64/libQSEEComAPI.so and b/proprietary/vendor/lib64/libQSEEComAPI.so differ
diff --git a/proprietary/vendor/lib64/libStDrvInt.so b/proprietary/vendor/lib64/libStDrvInt.so
index a894540..20ea348 100644
Binary files a/proprietary/vendor/lib64/libStDrvInt.so and b/proprietary/vendor/lib64/libStDrvInt.so differ
diff --git a/proprietary/vendor/lib64/libVkLayer_q3dtools.so b/proprietary/vendor/lib64/libVkLayer_q3dtools.so
index a42c473..617ad93 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 d4372bd..b0efe25 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/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so
index be6b3dc..415c752 100644
Binary files a/proprietary/vendor/lib64/libbtnv.so and b/proprietary/vendor/lib64/libbtnv.so differ
diff --git a/proprietary/vendor/lib64/libc2d30_bltlib.so b/proprietary/vendor/lib64/libc2d30_bltlib.so
index 92c06ff..62affca 100644
Binary files a/proprietary/vendor/lib64/libc2d30_bltlib.so and b/proprietary/vendor/lib64/libc2d30_bltlib.so differ
diff --git a/proprietary/vendor/lib64/libdisp-aba.so b/proprietary/vendor/lib64/libdisp-aba.so
index f75efdc..48bc3dd 100644
Binary files a/proprietary/vendor/lib64/libdisp-aba.so and b/proprietary/vendor/lib64/libdisp-aba.so differ
diff --git a/proprietary/vendor/lib64/libdrmfs.so b/proprietary/vendor/lib64/libdrmfs.so
index af5e980..3926688 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 0e4c84d..33e1f73 100644
Binary files a/proprietary/vendor/lib64/libdrmtime.so and b/proprietary/vendor/lib64/libdrmtime.so differ
diff --git a/proprietary/vendor/lib64/libgpudataproducer.so b/proprietary/vendor/lib64/libgpudataproducer.so
index 8b4c750..8125e96 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 b3595be..2c64d88 100644
Binary files a/proprietary/vendor/lib64/libgsl.so and b/proprietary/vendor/lib64/libgsl.so differ
diff --git a/proprietary/vendor/lib64/libhdr_tm.so b/proprietary/vendor/lib64/libhdr_tm.so
index 7725265..2c72c44 100644
Binary files a/proprietary/vendor/lib64/libhdr_tm.so and b/proprietary/vendor/lib64/libhdr_tm.so differ
diff --git a/proprietary/vendor/lib64/libllvm-glnext.so b/proprietary/vendor/lib64/libllvm-glnext.so
index 8024f26..91503a3 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 f207257..986f561 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/libqisl.so b/proprietary/vendor/lib64/libqisl.so
index e0edd58..443b7b1 100644
Binary files a/proprietary/vendor/lib64/libqisl.so and b/proprietary/vendor/lib64/libqisl.so differ
diff --git a/proprietary/vendor/lib64/libqseed3.so b/proprietary/vendor/lib64/libqseed3.so
index 5b0a21a..6031e83 100644
Binary files a/proprietary/vendor/lib64/libqseed3.so and b/proprietary/vendor/lib64/libqseed3.so differ
diff --git a/proprietary/vendor/lib64/librpmb.so b/proprietary/vendor/lib64/librpmb.so
index e6dbba3..8ff5e4d 100644
Binary files a/proprietary/vendor/lib64/librpmb.so and b/proprietary/vendor/lib64/librpmb.so differ
diff --git a/proprietary/vendor/lib64/librs_adreno.so b/proprietary/vendor/lib64/librs_adreno.so
index b36fc8c..5aa696e 100644
Binary files a/proprietary/vendor/lib64/librs_adreno.so and b/proprietary/vendor/lib64/librs_adreno.so differ
diff --git a/proprietary/vendor/lib64/libsdm-color.so b/proprietary/vendor/lib64/libsdm-color.so
index 879ba78..2b80383 100644
Binary files a/proprietary/vendor/lib64/libsdm-color.so and b/proprietary/vendor/lib64/libsdm-color.so differ
diff --git a/proprietary/vendor/lib64/libsdm-diag.so b/proprietary/vendor/lib64/libsdm-diag.so
index ca7b600..3d8494d 100644
Binary files a/proprietary/vendor/lib64/libsdm-diag.so and b/proprietary/vendor/lib64/libsdm-diag.so differ
diff --git a/proprietary/vendor/lib64/libsdm-disp-vndapis.so b/proprietary/vendor/lib64/libsdm-disp-vndapis.so
index 2810b14..c0c9fa2 100644
Binary files a/proprietary/vendor/lib64/libsdm-disp-vndapis.so and b/proprietary/vendor/lib64/libsdm-disp-vndapis.so differ
diff --git a/proprietary/vendor/lib64/libsdmextension.so b/proprietary/vendor/lib64/libsdmextension.so
index 1a87e2b..5aed383 100644
Binary files a/proprietary/vendor/lib64/libsdmextension.so and b/proprietary/vendor/lib64/libsdmextension.so differ
diff --git a/proprietary/vendor/lib64/libsecureui.so b/proprietary/vendor/lib64/libsecureui.so
new file mode 100644
index 0000000..d551c7b
Binary files /dev/null and b/proprietary/vendor/lib64/libsecureui.so differ
diff --git a/proprietary/vendor/lib64/libsecureui_svcsock.so b/proprietary/vendor/lib64/libsecureui_svcsock.so
index f4e18f0..bef7931 100644
Binary files a/proprietary/vendor/lib64/libsecureui_svcsock.so and b/proprietary/vendor/lib64/libsecureui_svcsock.so differ
diff --git a/proprietary/vendor/lib64/libsoc_helper.so b/proprietary/vendor/lib64/libsoc_helper.so
new file mode 100644
index 0000000..127e96a
Binary files /dev/null and b/proprietary/vendor/lib64/libsoc_helper.so differ
diff --git a/proprietary/vendor/lib64/libssd.so b/proprietary/vendor/lib64/libssd.so
index 0cffe75..465592c 100644
Binary files a/proprietary/vendor/lib64/libssd.so and b/proprietary/vendor/lib64/libssd.so differ
diff --git a/proprietary/vendor/lib64/libtinyxml2_1.so b/proprietary/vendor/lib64/libtinyxml2_1.so
index 974d121..f7fa844 100644
Binary files a/proprietary/vendor/lib64/libtinyxml2_1.so and b/proprietary/vendor/lib64/libtinyxml2_1.so differ
diff --git a/proprietary/vendor/lib64/vendor.display.color@1.0.so b/proprietary/vendor/lib64/vendor.display.color@1.0.so
index 09ec31c..281f7cd 100644
Binary files a/proprietary/vendor/lib64/vendor.display.color@1.0.so and b/proprietary/vendor/lib64/vendor.display.color@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.display.postproc@1.0.so b/proprietary/vendor/lib64/vendor.display.postproc@1.0.so
index df0f261..18dd67a 100644
Binary files a/proprietary/vendor/lib64/vendor.display.postproc@1.0.so and b/proprietary/vendor/lib64/vendor.display.postproc@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 95198f2..1b7c1fa 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 057b8f9..20fd0b2 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/sdm660-common-vendor.mk b/sdm660-common-vendor.mk
index 684fa95..55ef010 100644
--- a/sdm660-common-vendor.mk
+++ b/sdm660-common-vendor.mk
@@ -63,6 +63,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
     vendor/xiaomi/sdm660-common/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/xiaomi/sdm660-common/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/xiaomi/sdm660-common/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 \
@@ -107,7 +108,6 @@ PRODUCT_PACKAGES += \
     libgpudataproducer \
     libgpustats \
     libgsl \
-    libhdr_tm \
     libidl \
     libkeymasterdeviceutils \
     libkeymasterprovision \
@@ -128,20 +128,12 @@ PRODUCT_PACKAGES += \
     libqmi_encdec \
     libqmi_legacy \
     libqmiservices \
-    libqseed3 \
     librs_adreno \
-    libsdedrm \
-    libsdm-color \
-    libsdm-diag \
-    libsdm-disp-vndapis \
-    libsdmextension \
     libsdsprpc \
     libsysmon_cdsp_skel \
     libtinyxml2_1 \
     vendor.qti.hardware.mwqemadapter@1.0 \
-    btaudio_offload_if \
     sound_trigger.primary.sdm660 \
-    vendor.qti.hardware.bluetooth_audio@2.0-impl \
     libacdb-fts \
     libacdbloader \
     libacdbrtac \
@@ -149,8 +141,6 @@ PRODUCT_PACKAGES += \
     libadm \
     libadpcmdec \
     libaudcal \
-    libbluetooth_audio_session_qti \
-    libbluetooth_audio_session_qti_2_1 \
     libgcs-calwrapper \
     libgcs-ipc \
     libgcs-osal \
@@ -174,9 +164,6 @@ PRODUCT_PACKAGES += \
     com.dsi.ant@1.0-impl \
     vendor.qti.gnss@3.0-impl \
     vendor.qti.hardware.alarm@1.0-impl \
-    vendor.qti.hardware.bluetooth_sar@1.1-impl \
-    vendor.qti.hardware.btconfigstore@1.0-impl \
-    vendor.qti.hardware.btconfigstore@2.0-impl \
     vendor.qti.hardware.soter@1.0-impl \
     lib-imscmservice \
     lib-imsdpl \
@@ -193,7 +180,6 @@ PRODUCT_PACKAGES += \
     lib-uceservice \
     libGPreqcancel \
     libGPreqcancel_svc \
-    libSecureUILib \
     libStDrvInt \
     libbtnv \
     libcne \
@@ -207,6 +193,7 @@ PRODUCT_PACKAGES += \
     libdrmtime \
     libdsi_netctrl \
     libgdtap \
+    libhdr_tm \
     libizat_client_api \
     libizat_core \
     liblbs_core \
@@ -233,6 +220,7 @@ PRODUCT_PACKAGES += \
     libqdma_file_agent \
     libqisl \
     libqrtr \
+    libqseed3 \
     libqsocket \
     librcc \
     libril-qc-hal-qmi \
@@ -241,9 +229,15 @@ PRODUCT_PACKAGES += \
     libril-qc-radioconfig \
     librilqmiservices \
     librpmb \
+    libsdm-color \
+    libsdm-diag \
+    libsdm-disp-vndapis \
+    libsdmextension \
+    libsecureui \
     libsecureui_svcsock \
     libsettings \
     libslimclient \
+    libsoc_helper \
     libssd \
     libsystem_health_mon \
     libtime_genoff \
@@ -256,8 +250,6 @@ PRODUCT_PACKAGES += \
     qtibus \
     qtimutex \
     vendor.display.color@1.0 \
-    vendor.display.color@1.1 \
-    vendor.display.color@1.2 \
     vendor.display.postproc@1.0 \
     vendor.qti.data.factory@2.0 \
     vendor.qti.data.factory@2.1 \
@@ -322,21 +314,21 @@ PRODUCT_PACKAGES += \
     vendor.qti.imsrtpservice@3.0-service-Impl \
     vendor.qti.imsrtpservice@3.0_vendor \
     vendor.qti.latency@2.0 \
-    dirac_resource \
-    libFastRPC_AUE_Forward_skel \
-    libFastRPC_UTF_Forward_800h_skel \
-    libFastRPC_UTF_Forward_Qtc2_skel \
-    libadsp_fd_skel \
-    libadsp_hvx_add_constant \
-    libadsp_hvx_skel \
-    libapps_mem_heap \
-    libdirac-capiv2 \
-    libdspCV_skel \
-    libfastcvadsp \
-    libfastcvadsp_skel \
-    libscveBlobDescriptor_skel \
-    libscveObjectSegmentation_skel \
-    libscveT2T_skel \
+    vendor_lib_rfsa_adsp_dirac_resource_dar \
+    vendor_lib_rfsa_adsp_libFastRPC_AUE_Forward_skel_so \
+    vendor_lib_rfsa_adsp_libFastRPC_UTF_Forward_800h_skel_so \
+    vendor_lib_rfsa_adsp_libFastRPC_UTF_Forward_Qtc2_skel_so \
+    vendor_lib_rfsa_adsp_libadsp_fd_skel_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_add_constant_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_skel_so \
+    vendor_lib_rfsa_adsp_libapps_mem_heap_so \
+    vendor_lib_rfsa_adsp_libdirac-capiv2_so \
+    vendor_lib_rfsa_adsp_libdspCV_skel_so \
+    vendor_lib_rfsa_adsp_libfastcvadsp_so \
+    vendor_lib_rfsa_adsp_libfastcvadsp_skel_so \
+    vendor_lib_rfsa_adsp_libscveBlobDescriptor_skel_so \
+    vendor_lib_rfsa_adsp_libscveObjectSegmentation_skel_so \
+    vendor_lib_rfsa_adsp_libscveT2T_skel_so \
     com.qualcomm.qti.dpm.api@1.0 \
     lib-imscamera \
     lib-imsvideocodec \
@@ -411,13 +403,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
-    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \
-    vendor_lib_libEGL_adreno_so \
-    vendor_lib_libGLESv2_adreno_so \
-    vendor_lib_libq3dtools_adreno_so \
-    vendor_lib64_libEGL_adreno_so \
-    vendor_lib64_libGLESv2_adreno_so \
-    vendor_lib64_libq3dtools_adreno_so
+    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so
 
 ifeq ($(BOARD_HAVE_QCOM_FM),true)