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

Change-Id: Icfecd4773d6d154596af87a9adf8867f5477750f