Upgrade emulator to emu-master-dev build 4716449
am: 7b0739a53a

Change-Id: I972110ccae0a949233d89987d0d20f6367d1fe4a