Merge "Upgrade emulator kernels"
am: b85e5ba482

Change-Id: I81c7015af42bf4151a8cb2f05fdc11274a1dcfc2