Merge "adb: win32: fix Unicode console output" am: 52126a414b am: d9de068a8a am: ff6a17d2a8
am: c1b863275d

Change-Id: I98b2e76551d026922199b96b3976bb2ffd446b75