Upgrade emulator to emu-master-dev build 3700138 am: 481f1f5b65
am: 8b4d20fc29

Change-Id: I97a10027a361dac6c1a2e6e131d3ca33cffb1a5a