Merge "Add libeffects_headers." into oc-dev