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

Change-Id: I7b4cdacb43d8a1ef03572caa315c72afcb4b4122