Android CTS 7.0 release 1
Merge "Upgrade emulator kernels" into nyc-dev