Upgrade emulator to emu-master-dev build 5621436
am: 417f720f18

Change-Id: If1eb2ea6c7324cb82f8b5fbfe1adc5ac40c7a2a7