ARM: Update (and cut down) mach-types