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

Change-Id: Ibda678183048126fc930525040de18b1b02b0d60