Merge "Upgrade emulator kernels 3.18"
am: 086d8c086d

Change-Id: Ie8b998deefee7ea9a6b3e07437e80e3413fa75d0