Android 6.0.1 release 12
Merge "Add Mips MSA feature to android_getCpuFeatures"