Merge "libeffects: Removed an extraneous semi-colon in a macro definition" am: 550fef9128 am: 3af8d57331

Change-Id: I4208ffeee18287e0a0ad0a118687145764dec492