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

This reverts commit 6f0d232ebfe1bfce7699f50511c89c2a18167400, reversing
changes made to 8aee518eac87db54a89d4a0c650d8bcc7b04bd0f.