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

Change-Id: I27a881261b9b2cca3ea2993412f3d4ffa5f7f42c