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

Change-Id: Idf2535467d4f932ae0f9687e9fb30b27f4915f37