Merge "Fix cert-dcl16-c clang-tidy warnings in audioflinger." am: c5a1e23f13
am: 413c961fb0

Change-Id: Ifaf9458dd74c144cfae05c8b78a7f144292f09f7