Merge "Do not force ARMv8-A." into main