Upgrade emulator to emu-master-dev build 4104019 am: d2f914045d
am: 43a789e8df

Change-Id: Id8e9a0b3d98c81c9e90083514be5349a83369bfa