Upgrade emulator to emu-master-dev build 6211620 am: 7d1a9c4dd1 am: 95dda95125

Change-Id: I4e6d430c4d0dab583e89679220ebdc83b90359c7