Fix build
Merge branch 'jb3' of https://github.com/CarbonDev/android_packages_apps_CarbonFibers into jb3
Revert "Fix build"

This reverts commit 0b5476ca12dff148a725b724d46ceab6261be25e.