am 0ad13cf2: Merge "fix adb_test Windows build"

* commit '0ad13cf2982d428a4db742877720e5f4be738fa4':
  fix adb_test Windows build