Android CTS 7.0 Release 30 (5353406)
Merge "Upgrade emulator kernels" into nyc-dev