am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability"

* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability