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

This reverts commit f258a569ec3e7657b713702cc589538a8ee29b9d, reversing
changes made to c08f6693dac76d474a9813e3fb7a2763bdae3a2f.