Merge "Upgrade emulator kernels 3.18" am: 545e38acf7 am: 8188db94ad
am: dbbf4d6165

Change-Id: If24c1ad1166663d335da401d78a72e11c1316e44