Upgrade emulator to emu-master-dev build 4104019 am: b4d74283d3  -s ours am: 7df09460d7  -s ours
am: c05f588fe3  -s ours

Change-Id: Iaa36f76fe0d6565ca8f25ec4574563505541b9df