Themes: Support applying components from multiple themes [2/3]

Change-Id: Ic44be174876f10af37351690b65cd105c42d8392
Modify config to support app specific themes [2/4]

See frameworks/base commit for full msg. This is just simple renaming.

Change-Id: I034627fb252e2971d5dbddf24961b9afbb64e21a