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

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

Change-Id: I7bccd9b2cac8940bdac86e23e17ab221a26e7677