am 4523c862: (-s ours) am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '4523c86247621d683d03ed70dedd68b000df3943':