Merge "Support <include> directives in manifests." am: ed31855802 am: c611ab31bf am: beba402bd3 am: 4c52664326
am: 2b3f36c313

Change-Id: I95557acf0c95fa6f6ea877137d0826d85318ad39