Merge "Remove useless HOST_OS==windows check"