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

Change-Id: I4b2b3eba3266f132b77fa1a13023432c3b088fa5