Merge \"MIPS32: Fix MipsInstructionSetFeatures::FromVariant()\"
am: 74c0d1bb67

Change-Id: Ia0d2d2a0f219bde9c8becd551b5f662d38241e6c