Merge "ARM: Instruction set features clean-up."