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

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

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

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

Change-Id: Ib4fadb7a6a3e29db7bb5b9cde5f3351b38729011