Merge "Fix clang-tidy warnings in drm." am: e055519839 am: aee0669a7b am: adc67b2078
am: 08b045338b

Change-Id: Ie87f1cf64a99434142e1a1be4e21773631c11bb0