Merge "libsnapshot: Ensure we can remove bad snapshots when beginning an update."