diff --git a/patches/build/make/0001-x86-treble-builds-Let-BOARD_SYSTEMIMAGE_PARTITION_SI.patch b/patches/build/make/0001-x86-treble-builds-Let-BOARD_SYSTEMIMAGE_PARTITION_SI.patch
deleted file mode 100644
index 73a7d3f..0000000
--- a/patches/build/make/0001-x86-treble-builds-Let-BOARD_SYSTEMIMAGE_PARTITION_SI.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From df772e3d88a221254013e8a4f7339a8a2b268e4f Mon Sep 17 00:00:00 2001
-From: Jon West <electrikjesus@gmail.com>
-Date: Sat, 17 Nov 2018 16:34:02 -0500
-Subject: [PATCH] [x86/treble builds] Let BOARD_SYSTEMIMAGE_PARTITION_SIZE
- error pass for these builds
-
-change this to a warning
-
-Change-Id: I87852590d59bab2cc25d8a6fa462f5f30a393099
----
- core/config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/config.mk b/core/config.mk
-index 884495305a..d006c32c04 100644
---- a/core/config.mk
-+++ b/core/config.mk
-@@ -968,7 +968,7 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)
- 
- ifneq ($(BOARD_SYSTEMIMAGE_PARTITION_SIZE),)
- ifneq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
--$(error Should not define BOARD_SYSTEMIMAGE_PARTITION_SIZE and \
-+$(warning Should not define BOARD_SYSTEMIMAGE_PARTITION_SIZE and \
-     BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE together)
- endif
- endif
--- 
-2.17.1
-
diff --git a/patches/build/make/0002-Revert-Remove-root-folder-bt_firmware-in-GSI.patch b/patches/build/make/0002-Revert-Remove-root-folder-bt_firmware-in-GSI.patch
new file mode 100644
index 0000000..7102a75
--- /dev/null
+++ b/patches/build/make/0002-Revert-Remove-root-folder-bt_firmware-in-GSI.patch
@@ -0,0 +1,53 @@
+From be2d13da242a0b1a25fcbac6d771485d01867eb2 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 27 Mar 2018 23:26:49 +0200
+Subject: [PATCH] Revert "Remove root folder bt_firmware in GSI"
+
+This reverts commit 292b8433cb48ef4ceb2330e57e11b8f644d9d1ee.
+
+Essential 8.1 firmware requires this
+---
+ target/board/generic_arm64_ab/BoardConfig.mk         | 2 +-
+ target/board/generic_arm64_ab/sepolicy/file.te       | 1 +
+ target/board/generic_arm64_ab/sepolicy/file_contexts | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
+index fc6b58284..820019676 100644
+--- a/target/board/generic_arm64_ab/BoardConfig.mk
++++ b/target/board/generic_arm64_ab/BoardConfig.mk
+@@ -33,7 +33,7 @@ TARGET_NO_RECOVERY := true
+ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+ 
+ # TODO(jiyong) These might be SoC specific.
+-BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
++BOARD_ROOT_EXTRA_FOLDERS += bt_firmware firmware firmware/radio persist
+ BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
+ 
+ # Set this to create /cache mount point for non-A/B devices that mounts /cache.
+diff --git a/target/board/generic_arm64_ab/sepolicy/file.te b/target/board/generic_arm64_ab/sepolicy/file.te
+index 7adfdfa4e..46455339a 100644
+--- a/target/board/generic_arm64_ab/sepolicy/file.te
++++ b/target/board/generic_arm64_ab/sepolicy/file.te
+@@ -1,5 +1,6 @@
+ # TODO(b/36764215): remove this file when the generic system image
+ # no longer has these directories
++type bt_firmware_file, file_type;
+ type persist_file, file_type;
+ 
+ # Default type for anything under /firmware.
+diff --git a/target/board/generic_arm64_ab/sepolicy/file_contexts b/target/board/generic_arm64_ab/sepolicy/file_contexts
+index 0a80559e1..92a4ff872 100644
+--- a/target/board/generic_arm64_ab/sepolicy/file_contexts
++++ b/target/board/generic_arm64_ab/sepolicy/file_contexts
+@@ -2,6 +2,7 @@
+ # no longer has these directories. They are specific to QCOM.
+ 
+ # /
++/bt_firmware(/.*)?      u:object_r:bt_firmware_file:s0
+ /tombstones             u:object_r:rootfs:s0
+ /dsp                    u:object_r:rootfs:s0
+ 
+-- 
+2.17.1
+