Merge "adb: win32: improve console output on Windows 10" am: 54d1e31c63
am: d2f6058806

Change-Id: Iccfecbe31c202e8a65b3ac7517b7975e8b391868