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

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