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

Change-Id: Icb854f3c5cd95e3c5d427f1003bcfc54b529df7f