Merge "Revert "Disable clang-tidy for Effects.cpp"" am: 3a2f04cf5d am: 26bca1d6df am: 80810ed5ea

Change-Id: Ide8321169d86be7db764081d471c0cd89a836175