Sync with Perforce @ 1052625

This syncs up zfs-ffi with every change in Perforce.