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

* commit '4417c38a1eb64fb7cfffa75a5f705a79484ed3d5':
  adb unittest: get test_unicode_paths passing on win32