Merge "Upgrade emulator kernels 3.18" am: fe3a2d5cc2
am: f22c45a5a9

Change-Id: Ifec7702981e7ad65e4ff0dbca9b6be930feb9244