Fix cert-dcl16-c clang-tidy warnings. am: a8c052d038 am: 0c5885db1d
am: 3e7cbc546a

Change-Id: Icf2ece3258c82dd226bcdf0900b074f724cbce5f