Fix for parallel data race in layout code. Fixes #2308.
auto merge of #2369 : glennw/servo/issue-2308, r=metajack

There might be a "cleaner" rust way to separate the scope and invoke the drop() call?