am 5bd3c3bb: (-s ours) am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."

* commit '5bd3c3bb5435e2b7cfe521875776a11ddfe3cabd':