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