Merge "Revert "Define O_BINARY for non-Windows platforms.""