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

Change-Id: I5ccd9d19654cb048f09c1d8e151c074a7ad3d3c9