Merge "libsnapshot_test: hardcode alignment." am: 83c23a0650 am: f32197f28a

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

Change-Id: Id0d5fda3a536c8f826e815f1d00ffc0e09ddf411