Merge "Remove remaining references to SkCanvas::SaveFlags"