Revert "Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_base into CyanogenMod-cm-11.0"

This reverts commit f405047a93ceb07c93e775a8631228914ef51c37, reversing
changes made to a28a771c5a121777112e97d120bc2b64951642a6.