Merge "Upgrade emulator kernels 3.18"
am: fc5567993a

Change-Id: I174b559cd3d3cec4cd4ee9391d3b67635a3a6810