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

Change-Id: I6f4d8e6483ab19a261b4e6b75b11c2187268792a