Merge "Support <include> directives in manifests." am: ed31855802
am: c611ab31bf

Change-Id: I166bec714e151a6c2e424a9ec75129ebd5ec40b0