Merge "Upgrade emulator kernels 3.18"
am: 3d9cd7f8e8

Change-Id: Id7e24d2ec3ae8ca74bdddd635e730052c32c6e0b