ARM: Fix ARM_MSM selections