Merge "emulator: use 3.18 kernel as default am: f3bf91d590 am: fe8f0a22fb"