Upgrade emulator to emu-master-dev build 6317390 am: 3cd933a932 am: 6c7ae026ca

Change-Id: I85a0e4dd251e870bd2b8f7b8d6e824b29c1028c2