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

Change-Id: Idbb3fe875ca817b115871ec5569cb3e6607b3e5a