Merge "Fix warnings in frameworks/av/media/libeffects/factory" am: dfd91c514f
am: 63d03638a6

Change-Id: I4d488a06643d8a8fb30edc395ab1af58af899789