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

* commit 'a376c046bf7f5f86b53190d1f8dab309dd80a58b':
  Remove HOST_OS==windows check