Revert "Fix for crashes and failures due to 32-bit x86 struct layout."

This reverts commit 71c95f75f20efd5eb9a17504d6be8ff59552232a.

Change-Id: I12d10d52a5948e3c88999a4034f088a1d30cfe34
Reason: AddressSanitizer: container-overflow (aosp-master/aosp_x86_64-eng build)
12 files changed