diff --git a/Android.bp b/Android.bp
index e1acba7..9c598ad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,54 +58,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "eglSubDriverAndroid",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/egl/eglSubDriverAndroid.so",
-            ],
-            shared_libs: [
-                "libEGL_adreno",
-                "libcutils",
-                "libhardware",
-                "libgsl",
-                "libdl",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/egl/eglSubDriverAndroid.so",
-            ],
-            shared_libs: [
-                "libEGL_adreno",
-                "libcutils",
-                "libhardware",
-                "libgsl",
-                "libdl",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    relative_install_path: "egl",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libEGL_adreno",
     owner: "xiaomi",
@@ -191,7 +143,6 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
     relative_install_path: "egl",
     prefer: true,
     soc_specific: true,
@@ -245,48 +196,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libQTapGLES",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/egl/libQTapGLES.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libdl",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/egl/libQTapGLES.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libdl",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    relative_install_path: "egl",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libq3dtools_adreno",
     owner: "xiaomi",
@@ -324,14 +233,13 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
     relative_install_path: "egl",
     prefer: true,
     soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
-    name: "vulkan.msm8953",
+    name: "libq3dtools_esx",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -339,7 +247,49 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: [
-                "proprietary/vendor/lib/hw/vulkan.msm8953.so",
+                "proprietary/vendor/lib/egl/libq3dtools_esx.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libz",
+                "libdl",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/egl/libq3dtools_esx.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libz",
+                "libdl",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    relative_install_path: "egl",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vulkan.adreno",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/hw/vulkan.adreno.so",
             ],
             shared_libs: [
                 "libadreno_utils",
@@ -358,7 +308,7 @@ cc_prebuilt_library_shared {
         },
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/hw/vulkan.msm8953.so",
+                "proprietary/vendor/lib64/hw/vulkan.adreno.so",
             ],
             shared_libs: [
                 "libadreno_utils",
@@ -377,7 +327,58 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vulkan.pastel",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/hw/vulkan.pastel.so",
+            ],
+            shared_libs: [
+                "android.hardware.graphics.mapper@4.0",
+                "libnativewindow",
+                "libhardware",
+                "libhidlbase",
+                "libcutils",
+                "libsync",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/vulkan.pastel.so",
+            ],
+            shared_libs: [
+                "android.hardware.graphics.mapper@4.0",
+                "libnativewindow",
+                "libhardware",
+                "libhidlbase",
+                "libcutils",
+                "libsync",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -440,6 +441,7 @@ cc_prebuilt_library_shared {
                 "liblog",
                 "libgsl",
                 "libutils",
+                "libvndksupport",
                 "libc++",
                 "libc",
                 "libm",
@@ -455,6 +457,7 @@ cc_prebuilt_library_shared {
                 "liblog",
                 "libgsl",
                 "libutils",
+                "libvndksupport",
                 "libc++",
                 "libc",
                 "libm",
@@ -463,7 +466,6 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -481,6 +483,7 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libcutils",
+                "libvndksupport",
                 "libc++",
                 "libc",
                 "libm",
@@ -493,6 +496,7 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libcutils",
+                "libvndksupport",
                 "libc++",
                 "libc",
                 "libm",
@@ -1039,7 +1043,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libbccQTI",
+    name: "libc2d30-a3xx",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -1047,9 +1051,12 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: [
-                "proprietary/vendor/lib/libbccQTI.so",
+                "proprietary/vendor/lib/libc2d30-a3xx.so",
             ],
             shared_libs: [
+                "libgsl",
+                "libcutils",
+                "libutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -1058,9 +1065,12 @@ cc_prebuilt_library_shared {
         },
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libbccQTI.so",
+                "proprietary/vendor/lib64/libc2d30-a3xx.so",
             ],
             shared_libs: [
+                "libgsl",
+                "libcutils",
+                "libutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -1797,7 +1807,6 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -2233,6 +2242,49 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libpvr",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libpvr.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libQSEEComAPI",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libpvr.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libQSEEComAPI",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libqcci_legacy",
     owner: "xiaomi",
@@ -3355,8 +3407,6 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -3372,8 +3422,98 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.display.color@1.1",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/vendor.display.color@1.1.so",
+            ],
+            shared_libs: [
+                "vendor.display.color@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        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: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.display.color@1.2",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/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",
+            ],
+        },
+        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",
@@ -3402,8 +3542,6 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -3419,8 +3557,6 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -3936,6 +4072,49 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.qdutils_disp@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.tui_comm@1.0",
     owner: "xiaomi",
@@ -4444,6 +4623,37 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "eglSubDriverAndroid",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/egl/eglSubDriverAndroid.so",
+            ],
+            shared_libs: [
+                "libEGL_adreno",
+                "libcutils",
+                "libhardware",
+                "libgsl",
+                "libdl",
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "egl",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "android.hardware.bluetooth@1.0-impl-qti",
     owner: "xiaomi",
@@ -8148,7 +8358,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",
@@ -8157,7 +8367,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",
@@ -8166,7 +8376,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",
@@ -8175,7 +8385,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",
@@ -8184,7 +8394,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",
@@ -8193,7 +8403,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_hvx_stats",
+    name: "vendor_lib_rfsa_adsp_libadsp_hvx_stats_so",
     filename: "libadsp_hvx_stats.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_hvx_stats.so",
@@ -8202,7 +8412,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_hvx_zzhdr_BGGR",
+    name: "vendor_lib_rfsa_adsp_libadsp_hvx_zzhdr_BGGR_so",
     filename: "libadsp_hvx_zzhdr_BGGR.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_hvx_zzhdr_BGGR.so",
@@ -8211,7 +8421,7 @@ prebuilt_rfsa {
 }
 
 prebuilt_rfsa {
-    name: "libadsp_hvx_zzhdr_RGGB",
+    name: "vendor_lib_rfsa_adsp_libadsp_hvx_zzhdr_RGGB_so",
     filename: "libadsp_hvx_zzhdr_RGGB.so",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/libadsp_hvx_zzhdr_RGGB.so",
@@ -8220,7 +8430,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",
@@ -8229,7 +8439,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",
@@ -8238,7 +8448,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",
@@ -8247,7 +8457,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",
@@ -8256,7 +8466,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",
@@ -10230,3 +10440,31 @@ install_symlink {
     installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so",
     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_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_libq3dtools_adreno_so",
+    soc_specific: true,
+    installed_location: "lib64/libq3dtools_adreno.so",
+    symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
+}
diff --git a/msm8953-common-vendor.mk b/msm8953-common-vendor.mk
index a9aff95..46fceee 100644
--- a/msm8953-common-vendor.mk
+++ b/msm8953-common-vendor.mk
@@ -98,13 +98,13 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     com.qualcomm.qti.dpm.api@1.0_vendor \
-    eglSubDriverAndroid \
     libEGL_adreno \
     libGLESv1_CM_adreno \
     libGLESv2_adreno \
-    libQTapGLES \
     libq3dtools_adreno \
-    vulkan.msm8953 \
+    libq3dtools_esx \
+    vulkan.adreno \
+    vulkan.pastel \
     libC2D2 \
     libCB \
     libOpenCL \
@@ -121,7 +121,7 @@ PRODUCT_PACKAGES += \
     libaudioalsa \
     libaudioconfigstore \
     libaudioparsers \
-    libbccQTI \
+    libc2d30-a3xx \
     libc2d30_bltlib \
     libcne \
     libcneapiclient \
@@ -149,6 +149,7 @@ PRODUCT_PACKAGES += \
     libminksocket \
     libmm-hdcpmgr \
     libperipheral_client \
+    libpvr \
     libqcci_legacy \
     libqdi \
     libqdp \
@@ -175,6 +176,8 @@ PRODUCT_PACKAGES += \
     libwvdrmengine \
     sensors.ssc \
     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.hardware.data.cne.internal.api@1.0 \
@@ -186,6 +189,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.data.iwlan@1.0 \
     vendor.qti.hardware.data.latency@1.0 \
     vendor.qti.hardware.data.qmi@1.0 \
+    vendor.qti.hardware.qdutils_disp@1.0 \
     vendor.qti.hardware.tui_comm@1.0 \
     vendor.qti.ims.rcsconfig@1.0_vendor \
     vendor.qti.latency@2.0 \
@@ -202,6 +206,7 @@ PRODUCT_PACKAGES += \
     com.qualcomm.qti.imscmservice@2.2 \
     com.qualcomm.qti.uceservice@2.0 \
     com.qualcomm.qti.uceservice@2.1 \
+    eglSubDriverAndroid \
     android.hardware.bluetooth@1.0-impl-qti \
     vendor.qti.gnss@3.0-impl \
     vendor.qti.hardware.alarm@1.0-impl \
@@ -319,19 +324,19 @@ PRODUCT_PACKAGES += \
     vendor.qti.imsrtpservice@2.0_vendor \
     vendor.qti.imsrtpservice@2.1-service-Impl \
     vendor.qti.imsrtpservice@2.1_vendor \
-    dirac_resource \
-    libFastRPC_AUE_Forward_skel \
-    libFastRPC_UTF_Forward_Qtc2_skel \
-    libadsp_hvx_add_constant \
-    libadsp_hvx_skel \
-    libadsp_hvx_stats \
-    libadsp_hvx_zzhdr_BGGR \
-    libadsp_hvx_zzhdr_RGGB \
-    libapps_mem_heap \
-    libdirac-capiv2 \
-    libdspCV_skel \
-    libfastcvadsp \
-    libfastcvadsp_skel \
+    vendor_lib_rfsa_adsp_dirac_resource_dar \
+    vendor_lib_rfsa_adsp_libFastRPC_AUE_Forward_skel_so \
+    vendor_lib_rfsa_adsp_libFastRPC_UTF_Forward_Qtc2_skel_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_add_constant_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_skel_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_stats_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_zzhdr_BGGR_so \
+    vendor_lib_rfsa_adsp_libadsp_hvx_zzhdr_RGGB_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 \
     com.qualcomm.qti.dpm.api@1.0 \
     libdiag_system \
     libdpmctmgr \
@@ -403,4 +408,8 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
-    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so
+    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \
+    vendor_lib_libEGL_adreno_so \
+    vendor_lib_libq3dtools_adreno_so \
+    vendor_lib64_libEGL_adreno_so \
+    vendor_lib64_libq3dtools_adreno_so
diff --git a/proprietary/vendor/bin/hw/vendor.display.color@1.0-service b/proprietary/vendor/bin/hw/vendor.display.color@1.0-service
index 44340e2..e9a8721 100644
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 4298aec..b2b37db 100644
Binary files a/proprietary/vendor/bin/mm-pp-dpps and b/proprietary/vendor/bin/mm-pp-dpps differ
diff --git a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so
deleted file mode 100644
index cb295f4..0000000
Binary files a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so and /dev/null differ
diff --git a/proprietary/vendor/lib/egl/libEGL_adreno.so b/proprietary/vendor/lib/egl/libEGL_adreno.so
index f99b713..71c4033 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 e9849c4..e58cd2b 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 b8e472a..91ba9c6 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/libQTapGLES.so b/proprietary/vendor/lib/egl/libQTapGLES.so
deleted file mode 100644
index 50e5f79..0000000
Binary files a/proprietary/vendor/lib/egl/libQTapGLES.so and /dev/null differ
diff --git a/proprietary/vendor/lib/egl/libq3dtools_adreno.so b/proprietary/vendor/lib/egl/libq3dtools_adreno.so
index 2e6977b..ab37465 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
new file mode 100644
index 0000000..0345d49
Binary files /dev/null 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
new file mode 100644
index 0000000..ce1a8ad
Binary files /dev/null and b/proprietary/vendor/lib/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib/hw/vulkan.msm8953.so b/proprietary/vendor/lib/hw/vulkan.msm8953.so
deleted file mode 100644
index 65d5429..0000000
Binary files a/proprietary/vendor/lib/hw/vulkan.msm8953.so and /dev/null differ
diff --git a/proprietary/vendor/lib/hw/vulkan.pastel.so b/proprietary/vendor/lib/hw/vulkan.pastel.so
new file mode 100644
index 0000000..70c8cfb
Binary files /dev/null and b/proprietary/vendor/lib/hw/vulkan.pastel.so differ
diff --git a/proprietary/vendor/lib/libC2D2.so b/proprietary/vendor/lib/libC2D2.so
index 41e6e34..8680714 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 0bb8eae..bcfe02f 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 434d312..9eb7acf 100644
Binary files a/proprietary/vendor/lib/libOpenCL.so and b/proprietary/vendor/lib/libOpenCL.so differ
diff --git a/proprietary/vendor/lib/libadreno_utils.so b/proprietary/vendor/lib/libadreno_utils.so
index 1a79dd5..4b01503 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/libbccQTI.so b/proprietary/vendor/lib/libbccQTI.so
deleted file mode 100644
index 8ae693d..0000000
Binary files a/proprietary/vendor/lib/libbccQTI.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libc2d30-a3xx.so b/proprietary/vendor/lib/libc2d30-a3xx.so
new file mode 100644
index 0000000..cc0f749
Binary files /dev/null and b/proprietary/vendor/lib/libc2d30-a3xx.so differ
diff --git a/proprietary/vendor/lib/libc2d30_bltlib.so b/proprietary/vendor/lib/libc2d30_bltlib.so
index ddff6c9..5e5b285 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/libdisp-aba.so b/proprietary/vendor/lib/libdisp-aba.so
index 29b6b61..54f8659 100644
Binary files a/proprietary/vendor/lib/libdisp-aba.so and b/proprietary/vendor/lib/libdisp-aba.so differ
diff --git a/proprietary/vendor/lib/libgsl.so b/proprietary/vendor/lib/libgsl.so
index 1e8bf31..f2d14bb 100644
Binary files a/proprietary/vendor/lib/libgsl.so and b/proprietary/vendor/lib/libgsl.so differ
diff --git a/proprietary/vendor/lib/libhdr_tm.so b/proprietary/vendor/lib/libhdr_tm.so
index 34d2858..c8619c2 100644
Binary files a/proprietary/vendor/lib/libhdr_tm.so and b/proprietary/vendor/lib/libhdr_tm.so differ
diff --git a/proprietary/vendor/lib/libllvm-glnext.so b/proprietary/vendor/lib/libllvm-glnext.so
index 7bf8b02..b8ef5c1 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 8a4e577..ec2fe15 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/libmm-hdcpmgr.so b/proprietary/vendor/lib/libmm-hdcpmgr.so
index d58bfbf..3fe5348 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/libpvr.so b/proprietary/vendor/lib/libpvr.so
new file mode 100644
index 0000000..db378b7
Binary files /dev/null and b/proprietary/vendor/lib/libpvr.so differ
diff --git a/proprietary/vendor/lib/libscalar.so b/proprietary/vendor/lib/libscalar.so
index ec7c770..03c07ac 100644
Binary files a/proprietary/vendor/lib/libscalar.so and b/proprietary/vendor/lib/libscalar.so differ
diff --git a/proprietary/vendor/lib/libsdm-color.so b/proprietary/vendor/lib/libsdm-color.so
index 7817d07..a061948 100644
Binary files a/proprietary/vendor/lib/libsdm-color.so and b/proprietary/vendor/lib/libsdm-color.so differ
diff --git a/proprietary/vendor/lib/libsdm-diag.so b/proprietary/vendor/lib/libsdm-diag.so
index a805005..b5b0f0d 100644
Binary files a/proprietary/vendor/lib/libsdm-diag.so and b/proprietary/vendor/lib/libsdm-diag.so differ
diff --git a/proprietary/vendor/lib/libsdm-disp-vndapis.so b/proprietary/vendor/lib/libsdm-disp-vndapis.so
index 896a358..5d147bd 100644
Binary files a/proprietary/vendor/lib/libsdm-disp-vndapis.so and b/proprietary/vendor/lib/libsdm-disp-vndapis.so differ
diff --git a/proprietary/vendor/lib/libsdmextension.so b/proprietary/vendor/lib/libsdmextension.so
index 4c1df21..50bc9a8 100644
Binary files a/proprietary/vendor/lib/libsdmextension.so and b/proprietary/vendor/lib/libsdmextension.so differ
diff --git a/proprietary/vendor/lib/libtinyxml2_1.so b/proprietary/vendor/lib/libtinyxml2_1.so
index dc631b7..6038638 100644
Binary files a/proprietary/vendor/lib/libtinyxml2_1.so and b/proprietary/vendor/lib/libtinyxml2_1.so differ
diff --git a/proprietary/vendor/lib/vendor.display.color@1.0.so b/proprietary/vendor/lib/vendor.display.color@1.0.so
index 8af2d1b..c34b5f7 100644
Binary files a/proprietary/vendor/lib/vendor.display.color@1.0.so and b/proprietary/vendor/lib/vendor.display.color@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.display.color@1.1.so b/proprietary/vendor/lib/vendor.display.color@1.1.so
new file mode 100644
index 0000000..56f1f5f
Binary files /dev/null and b/proprietary/vendor/lib/vendor.display.color@1.1.so differ
diff --git a/proprietary/vendor/lib/vendor.display.color@1.2.so b/proprietary/vendor/lib/vendor.display.color@1.2.so
new file mode 100644
index 0000000..289fb2b
Binary files /dev/null and b/proprietary/vendor/lib/vendor.display.color@1.2.so differ
diff --git a/proprietary/vendor/lib/vendor.display.postproc@1.0.so b/proprietary/vendor/lib/vendor.display.postproc@1.0.so
index d027a9e..01c9286 100644
Binary files a/proprietary/vendor/lib/vendor.display.postproc@1.0.so and b/proprietary/vendor/lib/vendor.display.postproc@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so
new file mode 100644
index 0000000..95509b2
Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so differ
diff --git a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so
index fad3d28..5b8be43 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 6f01ad7..946e8fb 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 7715b93..8f5e082 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 f42eb52..14727bc 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/libQTapGLES.so b/proprietary/vendor/lib64/egl/libQTapGLES.so
deleted file mode 100644
index be21de3..0000000
Binary files a/proprietary/vendor/lib64/egl/libQTapGLES.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/egl/libq3dtools_adreno.so b/proprietary/vendor/lib64/egl/libq3dtools_adreno.so
index 7760c9d..55fb052 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
new file mode 100644
index 0000000..a0049db
Binary files /dev/null and b/proprietary/vendor/lib64/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
new file mode 100644
index 0000000..c8bc107
Binary files /dev/null and b/proprietary/vendor/lib64/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.msm8953.so b/proprietary/vendor/lib64/hw/vulkan.msm8953.so
deleted file mode 100644
index 615c125..0000000
Binary files a/proprietary/vendor/lib64/hw/vulkan.msm8953.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.pastel.so b/proprietary/vendor/lib64/hw/vulkan.pastel.so
new file mode 100644
index 0000000..0ce583e
Binary files /dev/null and b/proprietary/vendor/lib64/hw/vulkan.pastel.so differ
diff --git a/proprietary/vendor/lib64/libC2D2.so b/proprietary/vendor/lib64/libC2D2.so
index 6d08af6..42594fa 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 eb73702..1da96a9 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libOpenCL.so b/proprietary/vendor/lib64/libOpenCL.so
index f61505e..0747c52 100644
Binary files a/proprietary/vendor/lib64/libOpenCL.so and b/proprietary/vendor/lib64/libOpenCL.so differ
diff --git a/proprietary/vendor/lib64/libadreno_utils.so b/proprietary/vendor/lib64/libadreno_utils.so
index bec1f41..435d352 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/libbccQTI.so b/proprietary/vendor/lib64/libbccQTI.so
deleted file mode 100644
index 87b2ee4..0000000
Binary files a/proprietary/vendor/lib64/libbccQTI.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libc2d30-a3xx.so b/proprietary/vendor/lib64/libc2d30-a3xx.so
new file mode 100644
index 0000000..87022ac
Binary files /dev/null and b/proprietary/vendor/lib64/libc2d30-a3xx.so differ
diff --git a/proprietary/vendor/lib64/libc2d30_bltlib.so b/proprietary/vendor/lib64/libc2d30_bltlib.so
index 291acac..f3ebc07 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 86380cd..f22f876 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/libgsl.so b/proprietary/vendor/lib64/libgsl.so
index 4641a1e..9e7b1fb 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 39796e5..e7c551d 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 ed317b8..b36a935 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 4839373..c87662b 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/libmm-hdcpmgr.so b/proprietary/vendor/lib64/libmm-hdcpmgr.so
index f36e78f..4df774f 100644
Binary files a/proprietary/vendor/lib64/libmm-hdcpmgr.so and b/proprietary/vendor/lib64/libmm-hdcpmgr.so differ
diff --git a/proprietary/vendor/lib64/libpvr.so b/proprietary/vendor/lib64/libpvr.so
new file mode 100644
index 0000000..0caabca
Binary files /dev/null and b/proprietary/vendor/lib64/libpvr.so differ
diff --git a/proprietary/vendor/lib64/libscalar.so b/proprietary/vendor/lib64/libscalar.so
index 0242132..7dea396 100644
Binary files a/proprietary/vendor/lib64/libscalar.so and b/proprietary/vendor/lib64/libscalar.so differ
diff --git a/proprietary/vendor/lib64/libsdm-color.so b/proprietary/vendor/lib64/libsdm-color.so
index d1c3a68..1231612 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 bfd2089..2b202b6 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 da87e83..6397603 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 9487917..81890fc 100644
Binary files a/proprietary/vendor/lib64/libsdmextension.so and b/proprietary/vendor/lib64/libsdmextension.so differ
diff --git a/proprietary/vendor/lib64/libtinyxml2_1.so b/proprietary/vendor/lib64/libtinyxml2_1.so
index fdca384..72d8a0a 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 793c7fd..728e258 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.color@1.1.so b/proprietary/vendor/lib64/vendor.display.color@1.1.so
new file mode 100644
index 0000000..abb4856
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.display.color@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.display.color@1.2.so b/proprietary/vendor/lib64/vendor.display.color@1.2.so
new file mode 100644
index 0000000..3990cdc
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.display.color@1.2.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 353ab38..f0f2c82 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.qdutils_disp@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so
new file mode 100644
index 0000000..5bfc8a8
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so differ