Merge "Fix cert-dcl16-c clang-tidy warnings in libeffects." am: 6d89c10db9 am: 739dc12e71
am: 4bcbfa0ec1

Change-Id: I2a222be63c1e42739b6ec2e359077f99a2dcfcb6