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

Change-Id: I521cd2383f2aab23f0204e3ad799f9fb231d05fd