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

* commit '21d1aa106120eae5a83ddafdf423eff1dbf915b7':