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

Change-Id: Ib8c8a708916990cd0909db1d512b0e97b6a55165