am 83226d04: am 61eee363: am 0ad13cf2: Merge "fix adb_test Windows build"

* commit '83226d0439ec34f2d9205b711b3ee3865821e485':
  fix adb_test Windows build