Merge "Upgrade emulator kernels 3.18" am: 086d8c086d
am: 0279de36f0

Change-Id: Iea8b888ea674e51121009cc9cd4916180a86ac76