tree 0a5abc951e9de946adc22dfb057c6da22aae9def
parent 7d7a69e1d31f00b8cac253aa2622a96078921ca0
parent 4e0870251b1349168436152caaff426ddf1f7f00
author David Gross <dgross@google.com> 1490909284 +0000
committer android-build-merger <android-build-merger@google.com> 1490909284 +0000

Structure layout logic cleanup. am: 9435054995
am: 4e0870251b

Change-Id: Ibe91d0e0853bb2262e58bdbf4062304e6838fc21