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