Revert "Merge commit 'refs/changes/60/460/3' of https://review.carbonrom.org/CarbonDev/android_packages_apps_CarbonFibers into kitkat"

This reverts commit 06a8a224622d2f4c7dc33cf133e1bee879ef204f, reversing
changes made to 3ddaea639796f84ac7238ab02448f901451dbb1d.