Modify config to support app specific themes [2/4]

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

Change-Id: I034627fb252e2971d5dbddf24961b9afbb64e21a
Merge branch 'cm' into HEAD