Merge "Remove GKI from gsi_$arch" am: ed4305638b am: 5bca6ff26c

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

Change-Id: Ib23fa4fb0d847637d13fbb2e47935ca91e233d08