Merge "Upgrade emulator kernels 3.18" am: 31371b495f am: 0f8492d071 am: 7fe4139b0c
am: fcfb23d26f

Change-Id: Ib86af4cf2f626353a9dae5ba230bd9dfe7f3756e