Merge "Fix cert-dcl16-c clang-tidy warnings."