Merge "emulator: merge oc-emu-dev development project" am: 5b7c6e387a  -s ours
am: 39cc80321d

Change-Id: I5aa63a3b02c33c595dcee6c77d97b035cc9f8e81