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

Change-Id: Ib09644fc3128d329203c16d625315ef21f7773c4