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

* commit 'd7f206d2b2fb34788c65f2cd092c4b4866f81546':
  adb unittest: fix Windows Unicode