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

Change-Id: I62be0b2e0b9d1d2bbdcc5f14ccb461a866405a0c