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

This reverts commit bb4c4ba0168fb0a5c2aaa659817ab412ddf081ef, reversing
changes made to 94b594183688640e6bffaffd815c79c5e0aa4c6c.