Merge "Use the ARM CPUID functions"