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

Change-Id: I31a4350e785a7ba9c47205b99727920fa9b403f6