Merge branch 'cm-12.0' of github.com:CyanogenMod/android_system_core into cm-12.0
Merge branch 'cm-12.0' of github.com:CyanogenMod/android_system_core into cm-12.0
Healthd: charger: allow override of LED/BACKLIGHT paths

Change-Id: Ib7372e441d554e16ffc20ce43993ee78cdc5b187
Merge branch 'cm-12.0' of github.com:CyanogenMod/android_system_core into cm-12.0
Merge remote-tracking branch 'temasek/cm-12.0' into cm-12.0