Merge "Upgrade emulator kernels"