am a54f14eb: Merge "adb unittest: get test_unicode_paths passing on win32"

* commit 'a54f14eb95d73c91aaa2a4387a79d897a4731060':
  adb unittest: get test_unicode_paths passing on win32