am b4bc2213: Merge "Remove useless HOST_OS==windows checks"

* commit 'b4bc2213acef2648bf7073fb33cceaa81afa2f2e':
  Remove useless HOST_OS==windows checks