Don't call insertCapabilities for legacy icon packs.

Change-Id: Ib10a6888259a4da7a2341dc738dc91d0a1839392
Modify config to support app specific themes [3/4]

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

Change-Id: If7011a93d60197b2879028902f8e9a190bac147d
Merge branch 'cm-11.0' into kk_mkt