Merge "libeffects: SUPPORT_MC macro clean up"