Merge "snapuserd: Address alignment fault on 32-bit systems" am: cddf0f75cf am: 2829220918

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

Change-Id: Id31293680496e4659e74fc6262d33c745206f505