Upgrade emulator to emu-master-dev build 6185563 am: d75f79d87f am: 96d51f6cf7

Change-Id: I59beeaeb3c17de85357fb3da26f3f798e8163cd7