Upgrade emulator to emu-master-dev build 6211485 am: c5cb6dffc2 am: f5535ed40f

Change-Id: Ied1fda507e2a342f7889c8d6e5045eb01ed81cf9