Merge "libeffects: Corrected scratch memory size calculations"