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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a1444dcf852c04f6f430f28d1381953cac773aa