Merge "CreateLightingFilter is now on SkColorMatrixFilter"