Revert "Merge commit 'refs/changes/10/810/1' of https://review.carbonrom.org/CarbonDev/android_packages_apps_CarbonFibers into kitkat"

This reverts commit 63907d37a98f56f61486f351f3802676b6f30058, reversing
changes made to 1a113e7c3d8277c0480db03a967dec0874405c5f.