Android CTS 7.0 Release 7 (3764516)
Merge "Upgrade emulator kernels" into nyc-dev