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

Change-Id: I95d0ee896e0c025f6fed8c17c0a382a86183fa56