Android 6.0.1 Release 69 (MMB30Y)
Merge "Add Mips MSA feature to android_getCpuFeatures"