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

Change-Id: I6399745a02abeb48adab3b3d8c2fbbd5b1fcbfa0