Add support for layout dir qualifiers.

Change-Id: I6da728d079975fa19f1ae816fa585031a9c6fe75
7 files changed