Merge "Fix cert-dcl16-c warnings" am: 2d028894c7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1978297

Change-Id: I52d5d846d5192c711a6c129aa1867f2f83facaad