Upgrade emulator to emu-master-dev build 6946397

Bug: 172076524
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I784438f15a28514c56bf50d15dba6a12b7f40a1e
37 files changed