Fix the ARM architecture detection mess.