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

Change-Id: Ibf9a3c8fb1bcfae273e26cbd271fb62a9452f260