CM11 Themes: Add support for composed icons [2/2]

Requires f/b patch http://review.cyanogenmod.org/#/c/65179

Change-Id: Id9dd024448ddab41ef92177cf0d4cbc9abea0523
Merge "CM11 Themes: Add support for composed icons [2/2]" into cm-11.0