tree 1ead7a95a014196b037e11d2ee69a0ae8ea59c9a
parent 8281b5d72ff27077c461aa22e5c51a3a69e25916
author David Gross <dgross@google.com> 1490757016 +0000
committer David Gross <dgross@google.com> 1490757016 +0000

Revert "Structure layout logic cleanup."

This reverts commit 8281b5d72ff27077c461aa22e5c51a3a69e25916.

Change-Id: I3ed6617ca890c8dfd537b645357d0344746e549a
Reason: AddressSanitizer: container-overflow (aosp-master/aosp_x86_64-eng build)