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

Change-Id: I5461127302c9b4cc1d0e91a461199ce1cd0ba3fe