clang-tidy: fix issues

Change-Id: I2e7154624ad712b97dfdc2942ab0e924c8c8c306
4 files changed