Framework and SystemUI: Refactor CM Additions resources

Change-Id: I14838aad7ef21f852cfc381f55ac8a14369d02c4
Merge "Framework and SystemUI: Refactor CM Additions resources" into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1