Merge "Remove use of SkRefCnt_SafeAssign."