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

* commit '3b3e42e994add92c61b98549f39a19acb6b37d7d':
  adb unittest: fix Windows Unicode