Merge Sonic's ArmCpuDetect changes (cross-project merge).
Linux Desktop buildfix.