Merge \"ART: Empty out sa_mask in ArmInstructionSetFeatures\"
am: 98dd28e79d

Change-Id: I633ab79afeb3c44ccf0c5a0f7e2840f20f6e0a7b