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

Change-Id: I31034b5f65fa75bfbcd18f26464510e88e470b10