Allow theme attributes in <include> tag, fix <tag> context

BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
2 files changed