Merge "Fix cert-dcl16-c clang-tidy warnings in libaudioclient." am: 8774dda490
am: e8f69f37be

Change-Id: Ie00fbed3d5c11f8aa874a29c2b4d3d1158e001fe