Upgrade emulator to emu-master-dev build 4581728
am: 7290825139

Change-Id: Ib181f0f475e5967b1cd1a0ed983c96dd334f8006