Merge "ARM64: Clean-up and extend the supported cpu_variant list."