Merge "Upgrade emulator kernels"
am: c18917e20f

Change-Id: I61da1d43e3a3a7910ea885dca02ded29ffe9b242