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

Change-Id: I19e2e4efb07ac4b258fe723217a9f43e33879c93