diff --git a/Android.bp b/Android.bp
index bd2b050..45bff5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,248 +11,6 @@ soong_namespace {
     ],
 }
 
-cc_prebuilt_library_shared {
-    name: "libmisys_jni.xiaomi",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system/lib/libmisys_jni.xiaomi.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libnativehelper",
-                "libhidlmemory",
-                "libhidlbase",
-                "libhidltransport",
-                "android.hidl.memory@1.0",
-                "android.hidl.allocator@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "vendor.xiaomi.hardware.misys@2.0",
-                "vendor.xiaomi.hardware.misys@3.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system/lib64/libmisys_jni.xiaomi.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libnativehelper",
-                "libhidlmemory",
-                "libhidlbase",
-                "libhidltransport",
-                "android.hidl.memory@1.0",
-                "android.hidl.allocator@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "vendor.xiaomi.hardware.misys@2.0",
-                "vendor.xiaomi.hardware.misys@3.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@1.0_system",
-    stem: "vendor.xiaomi.hardware.misys@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@2.0_system",
-    stem: "vendor.xiaomi.hardware.misys@2.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@2.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@3.0_system",
-    stem: "vendor.xiaomi.hardware.misys@3.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so",
-            ],
-            shared_libs: [
-                "android.hidl.allocator@1.0",
-                "android.hidl.memory.block@1.0",
-                "android.hidl.memory.token@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@3.0.so",
-            ],
-            shared_libs: [
-                "android.hidl.allocator@1.0",
-                "android.hidl.memory.block@1.0",
-                "android.hidl.memory.token@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@4.0_system",
-    stem: "vendor.xiaomi.hardware.misys@4.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@4.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcamera_algoup_jni.xiaomi",
     owner: "xiaomi",
@@ -366,6 +124,41 @@ cc_prebuilt_library_shared {
     prefer: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmisys_jni.xiaomi",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/libmisys_jni.xiaomi.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libnativehelper",
+                "libhidlmemory",
+                "libhidlbase",
+                "libhidltransport",
+                "android.hidl.memory@1.0",
+                "android.hidl.allocator@1.0",
+                "vendor.xiaomi.hardware.misys@1.0",
+                "vendor.xiaomi.hardware.misys@2.0",
+                "vendor.xiaomi.hardware.misys@3.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.xiaomi.hardware.campostproc@1.0",
     owner: "xiaomi",
@@ -395,27 +188,130 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@1.0-impl",
+    name: "vendor.xiaomi.hardware.misys@1.0_system",
+    stem: "vendor.xiaomi.hardware.misys@1.0",
     owner: "xiaomi",
     strip: {
         none: true,
     },
     target: {
-        android_arm: {
+        android_arm64: {
             srcs: [
-                "proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so",
+                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@1.0.so",
             ],
             shared_libs: [
                 "libhidlbase",
-                "libutils",
                 "liblog",
-                "vendor.xiaomi.hardware.misys@1.0",
+                "libutils",
+                "libcutils",
                 "libc++",
                 "libc",
                 "libm",
                 "libdl",
             ],
         },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@2.0_system",
+    stem: "vendor.xiaomi.hardware.misys@2.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@2.0.so",
+            ],
+            shared_libs: [
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@3.0_system",
+    stem: "vendor.xiaomi.hardware.misys@3.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@3.0.so",
+            ],
+            shared_libs: [
+                "android.hidl.allocator@1.0",
+                "android.hidl.memory.block@1.0",
+                "android.hidl.memory.token@1.0",
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@4.0_system",
+    stem: "vendor.xiaomi.hardware.misys@4.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/vendor.xiaomi.hardware.misys@4.0.so",
+            ],
+            shared_libs: [
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@1.0-impl",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
         android_arm64: {
             srcs: [
                 "proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@1.0-impl.so",
@@ -432,7 +328,7 @@ cc_prebuilt_library_shared {
             ],
         },
     },
-    compile_multilib: "both",
+    compile_multilib: "64",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -445,22 +341,6 @@ cc_prebuilt_library_shared {
         none: true,
     },
     target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libutils",
-                "liblog",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "vendor.xiaomi.hardware.misys@2.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
         android_arm64: {
             srcs: [
                 "proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@2.0-impl.so",
@@ -478,7 +358,7 @@ cc_prebuilt_library_shared {
             ],
         },
     },
-    compile_multilib: "both",
+    compile_multilib: "64",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -491,28 +371,6 @@ cc_prebuilt_library_shared {
         none: true,
     },
     target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libcheckpid",
-                "liblogwrap_vendor",
-                "libhidlmemory",
-                "vendor.xiaomi.hardware.misys@3.0",
-                "android.hidl.memory@1.0",
-                "android.hidl.allocator@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
         android_arm64: {
             srcs: [
                 "proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@3.0-impl.so",
@@ -536,7 +394,7 @@ cc_prebuilt_library_shared {
             ],
         },
     },
-    compile_multilib: "both",
+    compile_multilib: "64",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -549,22 +407,6 @@ cc_prebuilt_library_shared {
         none: true,
     },
     target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libutils",
-                "liblog",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "vendor.xiaomi.hardware.misys@4.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
         android_arm64: {
             srcs: [
                 "proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@4.0-impl.so",
@@ -582,282 +424,12 @@ cc_prebuilt_library_shared {
             ],
         },
     },
-    compile_multilib: "both",
+    compile_multilib: "64",
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libcheckpid",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libcheckpid.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "liblogwrap_vendor",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcheckpid.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "liblogwrap_vendor",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "liblogwrap_vendor",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/liblogwrap_vendor.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/liblogwrap_vendor.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@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.xiaomi.hardware.misys@2.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@2.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@3.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so",
-            ],
-            shared_libs: [
-                "android.hidl.allocator@1.0",
-                "android.hidl.memory.block@1.0",
-                "android.hidl.memory.token@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@3.0.so",
-            ],
-            shared_libs: [
-                "android.hidl.allocator@1.0",
-                "android.hidl.memory.block@1.0",
-                "android.hidl.memory.token@1.0",
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.misys@4.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@4.0.so",
-            ],
-            shared_libs: [
-                "vendor.xiaomi.hardware.misys@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libarcsat",
     owner: "xiaomi",
@@ -889,6 +461,62 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libcheckpid",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libcheckpid.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "liblogwrap_vendor",
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "liblogwrap_vendor",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/liblogwrap_vendor.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsupermoon",
     owner: "xiaomi",
@@ -916,6 +544,124 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@2.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@2.0.so",
+            ],
+            shared_libs: [
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@3.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@3.0.so",
+            ],
+            shared_libs: [
+                "android.hidl.allocator@1.0",
+                "android.hidl.memory.block@1.0",
+                "android.hidl.memory.token@1.0",
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.misys@4.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@4.0.so",
+            ],
+            shared_libs: [
+                "vendor.xiaomi.hardware.misys@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libOpenCL_system",
     owner: "xiaomi",
diff --git a/camera-vendor.mk b/camera-vendor.mk
index c3d3ef9..cd70128 100644
--- a/camera-vendor.mk
+++ b/camera-vendor.mk
@@ -42,27 +42,27 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/camera/proprietary/vendor/etc/init/vendor.xiaomi.hardware.misys@4.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.misys@4.0-service.rc
 
 PRODUCT_PACKAGES += \
+    libcamera_algoup_jni.xiaomi \
+    libcamera_mianode_jni.xiaomi \
+    libmicampostproc_client \
     libmisys_jni.xiaomi \
+    vendor.xiaomi.hardware.campostproc@1.0 \
     vendor.xiaomi.hardware.misys@1.0_system \
     vendor.xiaomi.hardware.misys@2.0_system \
     vendor.xiaomi.hardware.misys@3.0_system \
     vendor.xiaomi.hardware.misys@4.0_system \
-    libcamera_algoup_jni.xiaomi \
-    libcamera_mianode_jni.xiaomi \
-    libmicampostproc_client \
-    vendor.xiaomi.hardware.campostproc@1.0 \
     vendor.xiaomi.hardware.misys@1.0-impl \
     vendor.xiaomi.hardware.misys@2.0-impl \
     vendor.xiaomi.hardware.misys@3.0-impl \
     vendor.xiaomi.hardware.misys@4.0-impl \
+    libarcsat \
     libcheckpid \
     liblogwrap_vendor \
+    libsupermoon \
     vendor.xiaomi.hardware.misys@1.0 \
     vendor.xiaomi.hardware.misys@2.0 \
     vendor.xiaomi.hardware.misys@3.0 \
     vendor.xiaomi.hardware.misys@4.0 \
-    libarcsat \
-    libsupermoon \
     libOpenCL_system \
     MiuiCamera \
     vendor.xiaomi.hardware.misys-V1.0-java \
diff --git a/proprietary/system/lib/libmisys_jni.xiaomi.so b/proprietary/system/lib/libmisys_jni.xiaomi.so
deleted file mode 100644
index 1c5ffb8..0000000
Binary files a/proprietary/system/lib/libmisys_jni.xiaomi.so and /dev/null differ
diff --git a/proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so b/proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so
deleted file mode 100644
index 579e324..0000000
Binary files a/proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so and /dev/null differ
diff --git a/proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so b/proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so
deleted file mode 100644
index 26baade..0000000
Binary files a/proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so and /dev/null differ
diff --git a/proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so b/proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so
deleted file mode 100644
index 7948528..0000000
Binary files a/proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so and /dev/null differ
diff --git a/proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so b/proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so
deleted file mode 100644
index ddac531..0000000
Binary files a/proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so
deleted file mode 100644
index b3fbf08..0000000
Binary files a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so
deleted file mode 100644
index 5c86e62..0000000
Binary files a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so
deleted file mode 100644
index 0895e8f..0000000
Binary files a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so
deleted file mode 100644
index 8923043..0000000
Binary files a/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcheckpid.so b/proprietary/vendor/lib/libcheckpid.so
deleted file mode 100644
index f5936fc..0000000
Binary files a/proprietary/vendor/lib/libcheckpid.so and /dev/null differ
diff --git a/proprietary/vendor/lib/liblogwrap_vendor.so b/proprietary/vendor/lib/liblogwrap_vendor.so
deleted file mode 100644
index 65f3974..0000000
Binary files a/proprietary/vendor/lib/liblogwrap_vendor.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so
deleted file mode 100644
index 43949da..0000000
Binary files a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so
deleted file mode 100644
index 4dbbb5c..0000000
Binary files a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so
deleted file mode 100644
index 8f57bde..0000000
Binary files a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so
deleted file mode 100644
index 5c74b64..0000000
Binary files a/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so and /dev/null differ