Merge "Upgrade emulator kernels 3.18" am: 13342bf33b am: f9325c3aa5
am: 30ae5af50b

Change-Id: Ia6f7a930c157016bcf6442f33dd514e7c70beb68