[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow...

[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d372 am: fca9e4c3 -s ours am: fd0ebbee -s ours

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

Change-Id: Icab5999e83269154ee2ea224cd734608a4365857