nicki: undrep proprietary-files.txt

Change-Id: Ia2e5423f040c9b9f673663347457e6648698c4de
nicki: Enable multi-color battery LED

Change-Id: I29ab98b5da3a001cbe76d2c75aa86781c13f2c7c
Merge remote-tracking branch 'cm/cm-11.0' into HEAD