Merge "libsnapshot: Don't force-unmap in DeleteSnapshot()." am: 36acd1d246 am: b8089c639c
am: c3c6e73e97

Change-Id: I1de0da1eac4670804ebc8ddcff39e84cc550a544