Merge "adb unittest: fix Windows Unicode"