Upgrade emulator to emu-master-dev build 6289500 am: 4136d515b5 am: 6e52a149eb

Change-Id: I3d2bb207284c025a5c57f5e786a04716b2fd667b