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

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

Change-Id: Ib5a3310a0d0903240140455acc321db67c0258be
Signed-off-by: Automerger Merge Worker <[email protected]>