Android CTS 7.0 Release 3 (3423912)
Merge "Upgrade emulator kernels" into nyc-dev