Merge "libsnapshot: update opcountcheck" into main am: 4f5a9950 am: 4fd465b9

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



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