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: I73722f3119bbc5026ab21ed1b0fc0c145ca1459d
Signed-off-by: Automerger Merge Worker <[email protected]>