Merge "libeffects: fix enum conversion warnings." am: bb38f90602
am: 8639a4b67a

Change-Id: Ib1c9f91d1e4b1de800186b0b807c8b081f224c15