[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow...
[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d372 -s ours
am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 e6c1a842 is in history
Change-Id: I0b13a874776dde10f66f4fbb1cc95d1a8b428f26