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

Change-Id: I3a5c46f3f8f1b00d368f3c5830981fb813cb2add