Merge "Fix cert-dcl16-c clang-tidy warnings in include." am: fc3c56fb85
am: f9eee4612b

Change-Id: Ic413cb25a56764cdf0b1af0c92e33ebd766d75c4