Merge "cpplint: Remove many unnecessary NOLINT"