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

* commit '61eee3636f96a0b32be3304796e6af4421d03a4e':
  fix adb_test Windows build