Android 7.0.0 Release 13 (NBD90X)
Merge "Upgrade emulator kernels" into nyc-dev