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

This reverts commit 401b328179e5ca872261c7a46cc314446fda23e2, reversing
changes made to a10403fe4c8854e96e7ccf9a0f336462a48e0e58.