Android CTS 7.0 Release 31 (5450832)
Merge "Upgrade emulator kernels" into nyc-dev