Merge "libsnapshot: update offset functions" into main am: b119efef

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



Change-Id: Iae1c49fd0490a79c626a2ef11199f9729db6e166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>