Fix a few clang-tidy warnings

Test: still builds
Change-Id: I6583f4f600a24a0784cdda186f77d5cacffc6cc5
5 files changed