Upgrade emulator to emu-master-dev build 4604419 am: a0b027c81b am: 2679e3baaf
am: 9fdcb81848

Change-Id: I0a63ec710e114e0ddeec7fd63e2fa8e8e41d4079