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

Change-Id: Iac0b1e4041336ba530fdaa3c860620d885a47acb