Merge "emulator: merge oc-emu-dev development project" into stage-aosp-master