Upgrade emulator to emu-master-dev build 6499764 am: 9d8693cc7d

Change-Id: I472a90e66fa4ac91d6bd0b9563ae5c8f26d9de16