Merge "Switch to SkSafeUnref for better portability"