Merge "Create gsi_x86 and gsi_x86_64 products" am: 3e5259c24e am: 5f932beecd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7a1d7ca0b70176e2c586dcbdf16236d7e5ce1e