Merge "Upgrade emulator kernels"
am: b35db745f1

Change-Id: I3821f81b0b6be4c8a05699e64b84a74b58a5ab89