Merge "adb: win32: test for Unicode console output" am: 756e28ee0c
am: 8ddbc4dac7

Change-Id: Ie047418be046117a29faf1e38ee0652a3495b1e9