Revert "Squashed commit of the theme engine support."

This reverts commit 2a3a634970f51913d602bb733213aab655b8be85.

Change-Id: I713d427dde29198579d559eaa8abd018d3dec315
Merge "Revert "Squashed commit of the theme engine support."" into 4.4