Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08 am: 1eb9b6cd21

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507553

Change-Id: I33168cadb52ca7074d5fcb6466682119c8f708ac