Upgrade emulator to emu-master-dev build 4240222 am: 87079d1b3f am: 25dec9283d  -s ours
am: b6b76dc765  -s ours

Change-Id: I5bf4a23b6ff5c912c056ba071f644c0eff4fecf3