Merge "Fix cert-dcl16-c warnings" am: 1af4aad6e4 am: c029617603 am: 4cdf6a7406

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1978906

Change-Id: I7e79d139731cb9fbf1e575ee079166e310e4fb74