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

Change-Id: If279f70753b91b7c0948445c8c36d681f03a5564