Android CTS 6.0 Release 12 (3417974)
Merge "Add Mips MSA feature to android_getCpuFeatures"