Merge "Fix cert-dcl16-c clang-tidy warnings."
am: d8199a618c

Change-Id: I9f72ec09e304011387bbe116e9dc693428054e68