Merge "Rename arch variant goldmont-without-xsaves to...

Merge "Rename arch variant goldmont-without-xsaves to goldmont-without-sha-xsaves" into main am: e11290c2 am: e7830dd4

Original change: https://android-review.googlesource.com/c/platform/build/+/2926253



Change-Id: I5457e146e391d3517fe7984fc220d87af90babad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>