Merge "libsnapshot: Remove all image data and metadata when cancelling an update." am: 710d6cc419
am: 332360fece

Change-Id: Id4150ea2cce64491c3ee08cf262f59476d197ae6