Merge "update emulator kernel 3.18" am: b42b06038b am: 24f2799ab9
am: 0bf2438875

Change-Id: If6de836a4230186ed48d25db3b177a9679b151c5