Merge "adb unittest: get test_unicode_paths passing on win32"