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

This reverts commit 749c2ef276fd5233cdb366673c73a05b58c20c7d, reversing
changes made to e73d70bb977acf6720a9728bf82ae3bcd9bacb5b.