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

Change-Id: I01b0ed6cdaa426fb8441492871c1e3bbae99d77f