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

Change-Id: I9f71eb69b73c6f35a8d7ec96b80fd597f8800f41