Simplify getARMCPUForMArch() and make it more consistent