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

Change-Id: I1a77a13e8b7a67063e79d8c6d1f74a5b8b3315d0