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

Change-Id: Ief3554b480bf3a7df4bcf133863f60f15216e69e