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

Change-Id: Ie0ca911f604b132174e5af6683eedb9b8cb291d2