Merge "libeffects: Pre-processing webrtc migration changes"