Upgrade emulator to emu-master-dev build 6212136

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