am 2f6d1e54: am a376c046: am aaf4fcf4: Merge "Remove HOST_OS==windows check"

* commit '2f6d1e5486042887e4ca864f0921409fd219e192':
  Remove HOST_OS==windows check