Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev