Upgrade emulator to emu-master-dev build 4537332 am: 4b260028dc
am: 261e978757

Change-Id: I3244afe01e2eb2bf0dab7783802a61c8c30e5b33