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

Change-Id: I12b46d44c63910a9780f49912407a6b0b98a0c21