Merge "Add GKI to gsi_x86_64 build" am: e03a908dba am: b9cefd3621 am: ca1919a507

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

Change-Id: I582361523d1dba3f73aa9ac0608948bd4b38248a