Merge "libsnapshot: Don't force-unmap in DeleteSnapshot()."