[clang-tidy] Fix clang-tidy errors from g3/gsgys config [2/2]

Fix the clang-tidy errors found here: https://paste.googleplex.com/5414723251339264

Tested: built from local changes and flashed successfully on machine

Change-Id: I18ee368bf3e8facb24c016af2f6cdf10c6ab634c
Signed-off-by: David Tang <davtang@google.com>
49 files changed