diff --git a/Android.bp b/Android.bp
index 46c80a2..a4c684f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,110 @@ 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_system", "vendor.xiaomi.hardware.misys@2.0_system", "vendor.xiaomi.hardware.misys@3.0_system", "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_system", "vendor.xiaomi.hardware.misys@2.0_system", "vendor.xiaomi.hardware.misys@3.0_system", "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_system", "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_system", "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_system", "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_system", "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_system", "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_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libcamera_algoup_jni.xiaomi",
 	owner: "xiaomi",
@@ -65,22 +169,6 @@ 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",
@@ -97,70 +185,6 @@ cc_prebuilt_library_shared {
 	prefer: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "vendor.xiaomi.hardware.misys@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		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: "64",
-	prefer: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "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",
-	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",
-	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",
@@ -168,12 +192,16 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so"],
+			shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
+		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@1.0-impl.so"],
 			shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
-	compile_multilib: "64",
+	compile_multilib: "both",
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -186,12 +214,16 @@ 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"],
 			shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@2.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
-	compile_multilib: "64",
+	compile_multilib: "both",
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -204,12 +236,16 @@ 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"],
 			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", ],
 		},
 	},
-	compile_multilib: "64",
+	compile_multilib: "both",
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -222,17 +258,147 @@ 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"],
 			shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@4.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
-	compile_multilib: "64",
+	compile_multilib: "both",
 	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: "lib_sr_models",
 	owner: "xiaomi",
@@ -284,23 +450,6 @@ 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: "libflaw",
 	owner: "xiaomi",
@@ -318,23 +467,6 @@ cc_prebuilt_library_shared {
 	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: "librelight_only",
 	owner: "xiaomi",
@@ -386,74 +518,6 @@ 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 85d87e7..dae90d8 100644
--- a/camera-vendor.mk
+++ b/camera-vendor.mk
@@ -43,32 +43,32 @@ 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 += \
+    libmisys_jni.xiaomi \
+    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 \
-    libmisys_jni.xiaomi \
     vendor.xiaomi.hardware.campostproc@1.0 \
-    vendor.xiaomi.hardware.misys@1.0 \
-    vendor.xiaomi.hardware.misys@2.0 \
-    vendor.xiaomi.hardware.misys@3.0 \
-    vendor.xiaomi.hardware.misys@4.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 \
-    lib_sr_models \
-    libarcsat \
-    libbeauty_face_interface \
     libcheckpid \
-    libflaw \
     liblogwrap_vendor \
-    librelight_only \
-    libsdk_sr \
-    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 \
+    lib_sr_models \
+    libarcsat \
+    libbeauty_face_interface \
+    libflaw \
+    librelight_only \
+    libsdk_sr \
+    libsupermoon \
     libOpenCL_system \
     MiuiCamera \
     vendor.xiaomi.hardware.misys-V1.0-java \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 42c33c1..c19247d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -32,11 +32,16 @@ system/framework/vendor.xiaomi.hardware.misys-V1.0-java.jar
 system/framework/vendor.xiaomi.hardware.misys-V2.0-java.jar
 system/framework/vendor.xiaomi.hardware.misys-V4.0-java.jar
 system/framework/vendor.xiaomi.hardware.misys.V3_0.jar
+system/lib/libmisys_jni.xiaomi.so
+system/lib/vendor.xiaomi.hardware.misys@1.0.so;MODULE_SUFFIX=_system
+system/lib/vendor.xiaomi.hardware.misys@2.0.so;MODULE_SUFFIX=_system
+system/lib/vendor.xiaomi.hardware.misys@3.0.so;MODULE_SUFFIX=_system
+system/lib/vendor.xiaomi.hardware.misys@4.0.so;MODULE_SUFFIX=_system
 system/lib64/libmisys_jni.xiaomi.so
-system/lib64/vendor.xiaomi.hardware.misys@1.0.so
-system/lib64/vendor.xiaomi.hardware.misys@2.0.so
-system/lib64/vendor.xiaomi.hardware.misys@3.0.so
-system/lib64/vendor.xiaomi.hardware.misys@4.0.so
+system/lib64/vendor.xiaomi.hardware.misys@1.0.so;MODULE_SUFFIX=_system
+system/lib64/vendor.xiaomi.hardware.misys@2.0.so;MODULE_SUFFIX=_system
+system/lib64/vendor.xiaomi.hardware.misys@3.0.so;MODULE_SUFFIX=_system
+system/lib64/vendor.xiaomi.hardware.misys@4.0.so;MODULE_SUFFIX=_system
 vendor/bin/hw/vendor.xiaomi.hardware.misys@1.0-service
 vendor/bin/hw/vendor.xiaomi.hardware.misys@2.0-service
 vendor/bin/hw/vendor.xiaomi.hardware.misys@3.0-service
@@ -49,6 +54,14 @@ vendor/etc/vintf/manifest/vendor.xiaomi.hardware.misys@1.0.xml
 vendor/etc/vintf/manifest/vendor.xiaomi.hardware.misys@2.0.xml
 vendor/etc/vintf/manifest/vendor.xiaomi.hardware.misys@3.0.xml
 vendor/etc/vintf/manifest/vendor.xiaomi.hardware.misys@4.0.xml
+vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so
+vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so
+vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so
+vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so
+vendor/lib/vendor.xiaomi.hardware.misys@1.0.so
+vendor/lib/vendor.xiaomi.hardware.misys@2.0.so
+vendor/lib/vendor.xiaomi.hardware.misys@3.0.so
+vendor/lib/vendor.xiaomi.hardware.misys@4.0.so
 vendor/lib64/hw/vendor.xiaomi.hardware.misys@1.0-impl.so
 vendor/lib64/hw/vendor.xiaomi.hardware.misys@2.0-impl.so
 vendor/lib64/hw/vendor.xiaomi.hardware.misys@3.0-impl.so
@@ -59,6 +72,8 @@ vendor/lib64/vendor.xiaomi.hardware.misys@3.0.so
 vendor/lib64/vendor.xiaomi.hardware.misys@4.0.so
 
 # MiSys Deps
+vendor/lib/libcheckpid.so
+vendor/lib/liblogwrap_vendor.so
 vendor/lib64/libcheckpid.so
 vendor/lib64/liblogwrap_vendor.so
 
diff --git a/proprietary/system/lib/libmisys_jni.xiaomi.so b/proprietary/system/lib/libmisys_jni.xiaomi.so
new file mode 100644
index 0000000..1c5ffb8
Binary files /dev/null and b/proprietary/system/lib/libmisys_jni.xiaomi.so 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
new file mode 100644
index 0000000..579e324
Binary files /dev/null and b/proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so 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
new file mode 100644
index 0000000..26baade
Binary files /dev/null and b/proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so 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
new file mode 100644
index 0000000..7948528
Binary files /dev/null and b/proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so 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
new file mode 100644
index 0000000..ddac531
Binary files /dev/null and b/proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so 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
new file mode 100644
index 0000000..b3fbf08
Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so 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
new file mode 100644
index 0000000..5c86e62
Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so 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
new file mode 100644
index 0000000..0895e8f
Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so 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
new file mode 100644
index 0000000..8923043
Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so differ
diff --git a/proprietary/vendor/lib/libcheckpid.so b/proprietary/vendor/lib/libcheckpid.so
new file mode 100644
index 0000000..f5936fc
Binary files /dev/null and b/proprietary/vendor/lib/libcheckpid.so differ
diff --git a/proprietary/vendor/lib/liblogwrap_vendor.so b/proprietary/vendor/lib/liblogwrap_vendor.so
new file mode 100644
index 0000000..65f3974
Binary files /dev/null and b/proprietary/vendor/lib/liblogwrap_vendor.so 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
new file mode 100644
index 0000000..43949da
Binary files /dev/null and b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so 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
new file mode 100644
index 0000000..4dbbb5c
Binary files /dev/null and b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so 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
new file mode 100644
index 0000000..8f57bde
Binary files /dev/null and b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so 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
new file mode 100644
index 0000000..5c74b64
Binary files /dev/null and b/proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so differ
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index b10f168..f18fdea 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -42,6 +42,29 @@ function vendor_imports() {
 EOF
 }
 
+function lib_to_package_fixup_system_variants() {
+    if [ "$2" != "system" ]; then
+        return 1
+    fi
+    case "$1" in
+          libmisys_jni.xiaomi | \
+          vendor.xiaomi.hardware.misys@1.0 | \
+          vendor.xiaomi.hardware.misys@2.0 | \
+          vendor.xiaomi.hardware.misys@3.0 | \
+          vendor.xiaomi.hardware.misys@4.0)
+            echo "${1}_system"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_system_variants "$@"
+}
+
 # Initialize the helper
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true