Merge "Fix clang-tidy warnings in drm."
am: e055519839

Change-Id: I99159fb0391af796445ea24265d088d20d178077