Upgrade emulator to emu-master-dev build 4552535
am: 95aeeb86cb

Change-Id: I6400ab23278d1328d07e3f4e46e1c338b00cce82