Android 7.0.0 release 4
Merge "Upgrade emulator kernels" into nyc-dev