am 71d25778: Merge "Switch to SkSafeUnref for better portability"

* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability