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