Upgrade emulator to emu-master-dev build 4104019 am: 03b8c743d1
am: e8688b1158

Change-Id: Ic49c03555eee6198dd64e120817be7991dbe3c5c