Revert "Merge remote-tracking branch 'cyanogenmod/cm-11.0' into kk"

This reverts commit 1ab3e3cab727adfd296e108b1c658ceaa2fdd05d, reversing
changes made to 105be881dc51526a8b334b6e94e52ffe72b9dda4.