Merge "Fix warnings in frameworks/av/media/libeffects/factory"