Upgrade emulator to emu-master-dev build 5533278 am: f60541aa7d
am: fa13bd332c

Change-Id: Ic1ea98d5d09d94a716dd207a2ce506e6b3649b28