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

Change-Id: I967f52f8790774ef7ce9ba6ef2665dc753016178