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

Change-Id: I280035db632973a747c43f987e0e362ab9152aa2