DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b38 am: c287a094af

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

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