Revert "Merge remote-tracking branch 'upstream/cm-11.0' into kitkat"

This reverts commit 806e9c1932a53647d28bb953428b2e28d8e36417, reversing
changes made to 5150596132671c85deb0272c85abb4e2d9712235.