Merge "libsnapshot: Fix crash in MakeXorBlockString test." am: 35cbd4d472

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

Change-Id: Ia0193420dec548250dadbd9543b42ad706d1856e