Merge "libsnapshot: fix incorrect assumption of cow images" am: 1af4a81f7d

Change-Id: I54686055237ee0441182b4e3b36befc733020b1d