am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."

* commit 'fbcdf6f9fe9212154b7b4bf3a4e6f16ad69ca994':
  Switch to BSD chown (for -R, primarily).