Snap for 8479413 from c44d96b20db626d6233fc6904a1fdc7b21346afa to tm-release

Change-Id: Ia5611f7fd70374b929e0095c09c6862cb341ca15
diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk
index eedfe28..c7970d7 100644
--- a/BoardConfigGkiCommon.mk
+++ b/BoardConfigGkiCommon.mk
@@ -40,9 +40,7 @@
 BOARD_USES_RECOVERY_AS_BOOT :=
 TARGET_NO_KERNEL := false
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
-
-# Pretend as a no-ramdisk device to exclude the ramdisk from the GKI boot image
-BOARD_BUILD_SYSTEM_ROOT_IMAGE ?= true
+BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK ?= true
 
 # No system image
 BOARD_SYSTEMIMAGE_PARTITION_SIZE :=