Merge "Replace SkDrawFilter with PaintFilter."