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

Change-Id: I976710643fbdf288ff7392f85aab133a1338b43c