Merge "libsnapshot: fix incorrect assumption of cow images"