Upgrade emulator to emu-master-dev build 6940967

Bug: 169285030
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I4c7081e44f0b962e527474087e8f23bcbd6766f7
17 files changed