diff --git a/Android.bp b/Android.bp
index 0c95808..4b3db9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2091,47 +2091,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libc2d30_bltlib",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libc2d30_bltlib.so",
-            ],
-            shared_libs: [
-                "libgsl",
-                "libcutils",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libc2d30_bltlib.so",
-            ],
-            shared_libs: [
-                "libgsl",
-                "libcutils",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcacertclient",
     owner: "samsung",
@@ -3963,6 +3922,7 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libgsl",
+                "liblog",
                 "libc++",
                 "libc",
                 "libm",
@@ -3975,6 +3935,7 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libgsl",
+                "liblog",
                 "libc++",
                 "libc",
                 "libm",
@@ -10452,6 +10413,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libc2d30_bltlib",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libc2d30_bltlib.so",
+            ],
+            shared_libs: [
+                "libgsl",
+                "libcutils",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libcamera_nn_stub",
     owner: "samsung",
diff --git a/acheron-vendor.mk b/acheron-vendor.mk
index 7defd69..769d59c 100644
--- a/acheron-vendor.mk
+++ b/acheron-vendor.mk
@@ -200,7 +200,6 @@ PRODUCT_PACKAGES += \
     libbthost_if \
     libbtnv \
     libc++_shared \
-    libc2d30_bltlib \
     libcacertclient \
     libcdfw \
     libcdfw_remote_api \
@@ -409,6 +408,7 @@ PRODUCT_PACKAGES += \
     libaudio_soundtrigger \
     libaudioparsers \
     libbatterylistener \
+    libc2d30_bltlib \
     libcamera_nn_stub \
     libcamxfdalgov7 \
     libcamxfdalgov8 \
diff --git a/proprietary/vendor/lib/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib/egl/eglSubDriverAndroid.so
index 6ccd566..1437c31 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 31925a2..fa870c9 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 1c8543c..17b5516 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 dff5b7a..72d6e53 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 5823819..1964f1e 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 16115c6..de43583 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 e624fcb..b6b9743 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 e799e95..be8d059 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 b3ae33f..b91e3f3 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 e57c065..4fa3bf7 100644
Binary files a/proprietary/vendor/lib/libOpenCL.so and b/proprietary/vendor/lib/libOpenCL.so differ
diff --git a/proprietary/vendor/lib/libVkLayer_q3dtools.so b/proprietary/vendor/lib/libVkLayer_q3dtools.so
index 6558e64..9510280 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 e70dd41..43aad09 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 cf74cfa..9aa861f 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 4e075c2..6c22b81 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 2785863..ebbff96 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 ab3da79..0c9b9b8 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 07cc26b..112ea16 100644
Binary files a/proprietary/vendor/lib/libllvm-qcom.so and b/proprietary/vendor/lib/libllvm-qcom.so differ
diff --git a/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so b/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so
index edbb675..3a5e055 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 202813b..9fe35d2 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 dbec51d..8aca50d 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 0f8f170..498e6ba 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 70ac67a..7aa77f9 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 945d51f..392ad2d 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/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
index 651146a..f92cc5e 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 42594fa..9eac1f5 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 1782344..0e6c9f8 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 5c6ba7a..f4c7d49 100644
Binary files a/proprietary/vendor/lib64/libOpenCL.so and b/proprietary/vendor/lib64/libOpenCL.so differ
diff --git a/proprietary/vendor/lib64/libVkLayer_q3dtools.so b/proprietary/vendor/lib64/libVkLayer_q3dtools.so
index ef06680..d05fe83 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 1afc70c..c881ed2 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/libgpudataproducer.so b/proprietary/vendor/lib64/libgpudataproducer.so
index b517832..27ddd59 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 45ed0b6..971b903 100644
Binary files a/proprietary/vendor/lib64/libgsl.so and b/proprietary/vendor/lib64/libgsl.so differ
diff --git a/proprietary/vendor/lib64/libllvm-glnext.so b/proprietary/vendor/lib64/libllvm-glnext.so
index f6a694f..bc93f11 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 39d2775..cb3157d 100644
Binary files a/proprietary/vendor/lib64/libllvm-qcom.so and b/proprietary/vendor/lib64/libllvm-qcom.so differ