Upgrade emulator to emu-master-dev build 6212136 am: c0338f26a0 am: c786896860 am: 519c37dd36

Change-Id: Ib24348ec5bf03046534fbd28b3f9cf71e451bf98