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

* commit '884cc4754b4062d7263000006b58bade82d09985':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]