Merge "Properly restore errno if NET_FAILURE_RETRY fails."