Merge "Upgrade emulator kernels 3.18"