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

Merge "libsnapshot: Fix test failures on certain configurations." am: 57feb3fb am: 5003beff am: c032f179

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



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