Merge "Remove a pointless use of SkWeakRefCnt." into master-skia

https://skia.googlesource.com/skia/+/60b6e9dbbc492f987a5b887dff60aec107ab70d0

Change-Id: Ia6cbc2ee686e811082ea084d336e2f2ff95093b2