[automerger skipped] libsnapshot_test: hardcode alignment. am: 755eb6b6 am:...

[automerger skipped] libsnapshot_test: hardcode alignment. am: 755eb6b6 am: 793495ef am: fe9e0745 -s ours

am skip reason: Change-Id I1d0474f028cc824bd4197d0228350395239b3b81 with SHA-1 755eb6b6 is in history

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

Change-Id: I178bf8f2a90c53fc0c244b63050482b85b077be9