goldfish: Merge 'goog/oc-emu-dev'