Revert "Merge commit 'refs/changes/95/1695/6' of https://review.carbonrom.org/CarbonDev/android_packages_apps_CarbonFibers into overscroll"

This reverts commit 1740f663288bf4125be2e16db5b5a422ad4f2b53, reversing
changes made to cf580d0f5892ce729430b65921d287775aee9a8a.