Snap for 7394644 from 033d50e2298811d81de7db8cdea63e349a96c9ba to sc-release

Change-Id: I178ff3b4cba966e795d942f59e6ca08e7cfcd68f
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.
 #