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

Change-Id: I4aff8ec92b257124780e08305010259b4a3b14fa