Merge "Fix LayoutSections for aligned last CodeItem."
am: 185f633f60

Change-Id: I500b58b2ab91f955b3389ee8587f3206863a43bb