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

Change-Id: I5b50ddada4c24ca6146baad0bbe023e209f469fe