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

Change-Id: I6941c50d7b7bc3ed08eb6d2e3cfc6913f227417a