Merge "ART: Fix or nolint cert-dcl16-c"
am: e79edef8fd

Change-Id: I0a1ec2767aa65933d5ccdf5923d572171e8c3ad6