Merge "emulator: merge oc-emu-dev development project" into stage-aosp-master
am: faa25392e7  -s ours

Change-Id: I4b6f4015c3463b46f31c514aff7444096fdb4feb