Upgrade emulator to emu-master-dev build 6499764

Signed-off-by: Lingfeng Yang <lfy@google.com>
Change-Id: I0f990b89b1c0c54a9a7e028c12cc52e456e98c1d
47 files changed