SCHEMA-431. Revert changes to Layout.avdl for schema validation.

issue: https://jira.kiji.org/browse/SCHEMA-431
review: https://review.kiji.org/r/674