[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d372 -s ours am: f7924aaa -s ours am: 7d691709 -s ours am: 9210df3e -s ours

am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 82035d6b is in history

Change-Id: If38b59a6dcc6fd12c013c945ca58a074bf3607c3