Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/Quarx2k/android_system_core into PA-kk
Revert "healthd: Add dock battery support"

This reverts commit 4bc9f638a11046daae3ea6dbd7de9246af7dd164.