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

Change-Id: Ib536686a71cc64520f5f37b0b1c7a42ea606ff94