Merge "libsnapshot: Fix test failures on certain configurations." am: 57feb3fbbd

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

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