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

This reverts commit 9f39c280ea50a90eebfb9bef4e85e0a27ed5b2fe, reversing
changes made to 6d622ae102dfd666c556d266b971e46e9decb15b.