Upgrade emulator to emu-master-dev build 6317390 am: 01edaea815

Change-Id: I8fb1f765f35f9bb08d84bf40448a2aa9734749a0