Merge "Add GKI to gsi_x86_64 build" am: e03a908dba

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1699469

Change-Id: Ifabe54af9f13a9ff604f8988a6dadab1b5e55cbb
diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index eb5bd97..da7e093 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -34,6 +34,11 @@
 $(call inherit-product, device/generic/common/gsi_product.mk)
 
 #
+# All components inherited here go to boot image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
+
+#
 # Special settings to skip mount product and system_ext on the device,
 # so this product can be tested isolated from those partitions.
 #