Merge "Fix clang-tidy warnings in drm."