Try again at privatizing the layout info map, with a rewritten patch.

This preserves the existing behavior much more closely than my previous attempt.

llvm-svn: 79663