Upgrade emulator to emu-master-dev build 4640189
am: 6e1ec0c0d0

Change-Id: Iabd75f6fe884c5f4a7660e5c37b23ceb72fe0361