Merge "ART: Empty out sa_mask in ArmInstructionSetFeatures"