Merge "static_assert to catch struct mismatches earlier" am: c3a7e486 am: bafed8b8

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



Change-Id: I5be1c8ab406f899d90d26633a347d4b0eac9c049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>