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

Change-Id: Ifc061abae1a0aa385bfceea2c9d1afa207510e37