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

Change-Id: Ie591c964854325189392c2a708631ae2f21c545e