Fix build

Revert "Adding support for dynamically resolved default layouts."

This reverts commit 667e4d395ca17de2b5bb0ec74202ee8f0673d894.

Change-Id: I1b4b900fa3551f9fe9ec938b89efa5a208001234
7 files changed