Merge "use SkBlendMode instead of SkXfermode use sk_sp versions of paint setters/getters"