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