Merge "emulator: use 3.18 kernel as default am: 386d1ba09b  -s ours" into oc-dr1-dev