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

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