diff --git a/Android.bp b/Android.bp
index e1c0b43..753e1b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,9 @@
 // This file is generated by device/samsung/r8s/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+		"vendor/samsung/exynos990-common",
+	],
 }
 
 cc_prebuilt_library_shared {
@@ -258,7 +261,12 @@ cc_prebuilt_library_shared {
 cc_prebuilt_binary {
 	name: "android.hardware.bluetooth@1.0-service-qti",
 	owner: "samsung",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -271,7 +279,12 @@ cc_prebuilt_binary {
 cc_prebuilt_binary {
 	name: "macloader",
 	owner: "samsung",
-	srcs: ["proprietary/vendor/bin/hw/macloader"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/macloader"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
diff --git a/proprietary/vendor/firmware/htbtfw20.tlv b/proprietary/vendor/firmware/htbtfw20.tlv
new file mode 100644
index 0000000..2f83984
Binary files /dev/null and b/proprietary/vendor/firmware/htbtfw20.tlv differ
diff --git a/proprietary/vendor/firmware/htnv20.bin b/proprietary/vendor/firmware/htnv20.bin
new file mode 100644
index 0000000..7b1ae49
Binary files /dev/null and b/proprietary/vendor/firmware/htnv20.bin differ
diff --git a/proprietary/vendor/firmware/is_rta.bin b/proprietary/vendor/firmware/is_rta.bin
index 03e34fc..815f507 100644
Binary files a/proprietary/vendor/firmware/is_rta.bin and b/proprietary/vendor/firmware/is_rta.bin differ
diff --git a/proprietary/vendor/lib64/libexynoscamera3.so b/proprietary/vendor/lib64/libexynoscamera3.so
index 808dee3..87b2a61 100644
Binary files a/proprietary/vendor/lib64/libexynoscamera3.so and b/proprietary/vendor/lib64/libexynoscamera3.so differ
diff --git a/proprietary/vendor/lib64/libexynoscamera_bayergdc_plugin.so b/proprietary/vendor/lib64/libexynoscamera_bayergdc_plugin.so
index 63323ee..9630e37 100644
Binary files a/proprietary/vendor/lib64/libexynoscamera_bayergdc_plugin.so and b/proprietary/vendor/lib64/libexynoscamera_bayergdc_plugin.so differ
diff --git a/proprietary/vendor/lib64/libexynoscamera_fakemultiframe.so b/proprietary/vendor/lib64/libexynoscamera_fakemultiframe.so
index 666fd0d..518bbbe 100644
Binary files a/proprietary/vendor/lib64/libexynoscamera_fakemultiframe.so and b/proprietary/vendor/lib64/libexynoscamera_fakemultiframe.so differ
diff --git a/proprietary/vendor/lib64/libexynoscamera_vpl_plugin.so b/proprietary/vendor/lib64/libexynoscamera_vpl_plugin.so
index 82c32ae..f672a80 100644
Binary files a/proprietary/vendor/lib64/libexynoscamera_vpl_plugin.so and b/proprietary/vendor/lib64/libexynoscamera_vpl_plugin.so differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
index f36aeee..387367b 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d and b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-0000534b504d b/proprietary/vendor/tee/00000000-0000-0000-0000-0000534b504d
index ce75c0a..a4d7b86 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-0000534b504d and b/proprietary/vendor/tee/00000000-0000-0000-0000-0000534b504d differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
index 1e924a4..12732ca 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab and b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502 b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502
index c1a1754..00b8b18 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502 and b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502 differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-474154454b45 b/proprietary/vendor/tee/00000000-0000-0000-0000-474154454b45
index 075a913..304cc3b 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-474154454b45 and b/proprietary/vendor/tee/00000000-0000-0000-0000-474154454b45 differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354 b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
index b96346d..7c7d0ee 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354 and b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354 differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545 b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
index 7a117af..ff8ac88 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545 and b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545 differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-54412d48444d b/proprietary/vendor/tee/00000000-0000-0000-0000-54412d48444d
index 0aba672..8bc84fd 100644
Binary files a/proprietary/vendor/tee/00000000-0000-0000-0000-54412d48444d and b/proprietary/vendor/tee/00000000-0000-0000-0000-54412d48444d differ
diff --git a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476 b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
index 3445a35..cc4b6f7 100644
Binary files a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476 and b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476 differ
diff --git a/r8s-vendor.mk b/r8s-vendor.mk
index 480821a..08770e3 100644
--- a/r8s-vendor.mk
+++ b/r8s-vendor.mk
@@ -28,6 +28,8 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8s/proprietary/vendor/firmware/cs40l20.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/cs40l20.bin \
     vendor/samsung/r8s/proprietary/vendor/firmware/dual_cal_wide_swide.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dual_cal_wide_swide.bin \
     vendor/samsung/r8s/proprietary/vendor/firmware/dual_cal_wide_tele.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dual_cal_wide_tele.bin \
+    vendor/samsung/r8s/proprietary/vendor/firmware/htbtfw20.tlv:$(TARGET_COPY_OUT_VENDOR)/firmware/htbtfw20.tlv \
+    vendor/samsung/r8s/proprietary/vendor/firmware/htnv20.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/htnv20.bin \
     vendor/samsung/r8s/proprietary/vendor/firmware/is_lib.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/is_lib.bin \
     vendor/samsung/r8s/proprietary/vendor/firmware/is_mcu_fw.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/is_mcu_fw.bin \
     vendor/samsung/r8s/proprietary/vendor/firmware/is_rta.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/is_rta.bin \