Merge "Make libeffects build with the VNDK."