am 2ea57042: am 4417c38a: am a54f14eb: Merge "adb unittest: get test_unicode_paths passing on win32"

* commit '2ea57042b815711afefcba2ccbf99485b7327962':
  adb unittest: get test_unicode_paths passing on win32