[automerger skipped] Upgrade emulator to emu-master-dev build 6317390 am: 3cd933a932 -s ours am: 91497adb75 -s ours

am skip reason: Change-Id I9f5bbb610c36abcbcae833cc8e40e37ec3a77e41 with SHA-1 01edaea815 is in history

Change-Id: I0b9928bb64f1b9fdcf1d0f3091a8b835283b56a6