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

Change-Id: If7b0218978b9e5c20ce101fbe1e0322a719711ef