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

This reverts commit 866180198a3b4db619a6b08d8aae14852dfc5e7c.

Change-Id: Ia77131bf78b53a4360c7fc36d295994119c296cc
2 files changed