Merge "Fix for crashes and failures due to 32-bit x86 struct layout."
am: 1cc1dcafc0

Change-Id: I469670b905650dc4e2fa8100e20b2077e730e31b