Upgrade emulator to emu-master-dev build 4476497 am: 24f4d554b5 am: b6563409bb
am: 4cc288fc35

Change-Id: I8cd52d989d6b04cb287f1dee2e0a577bbac4db1f