Merge "libsnapshot: Record COW size(s) in snapshot status file" am: a9ffef27e1
am: 6777935a94

Change-Id: If33ede191af8486aad9dfcc3d0a99f3eb6f18d93