Merge "Remove HOST_OS==windows check"