Merge "SkCanvas is no longer reference-counted"