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

Change-Id: I630a09d69f27a67c0620006c9e550f14fc5148fa