Upgrade emulator to emu-master-dev build 6499764

bug: 156818752
Signed-off-by: Lingfeng Yang <lfy@google.com>
Change-Id: I2aa925bc512a5ee0d9910d96313786fbdf47f23f
Merged-In: I2aa925bc512a5ee0d9910d96313786fbdf47f23f
47 files changed