Merge "Upgrade emulator kernels 3.18" am: 580410cc4a am: dd8de7e0e9
am: 4a9208105c

Change-Id: I945ebe6b2c4a8b4eb1db5ea6df931041ae8a49fd