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

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

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



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