Merge "Revert "Fix for crashes and failures due to 32-bit x86 struct layout.""
am: 20b63dbdea

Change-Id: I647753c33ddf54da5a8010509771cb9704a9555d