Merge "Revert "Enable layout compilation by default""
am: 5838c3f8bb

Change-Id: Ibe348b1cb778b897549439ddac5bfdfd193a40e9