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

Change-Id: Ifa216890b2a36a94368e16142d4f2fcbc5eac2d5