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

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

Change-Id: I0e78a01df832cc57f2de8372bbf8a9dc7a082284