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

Change-Id: Ife27f3fba1b6570c51caa132df994b9f657bd285