Revert "Merge with CyanogenMod"

This reverts commit c6b82c7f7d3b52dafa27049d6d55b562084895cf.