am 7e17f146: am 3b3e42e9: am d7f206d2: Merge "adb unittest: fix Windows Unicode"

* commit '7e17f146bfa7770b777df643373a646bc756fe41':
  adb unittest: fix Windows Unicode