Revert "@hide API change from themes"

This reverts commit 24bb6a4195f9afb03d98c649d2b318d2ee2ae8fd.

Change-Id: Id1c3c3a1f377bb9f36e737538e6db3e5bf99eee0
Merge "Revert "@hide API change from themes"" into 4.4