Cleanup
Merge branch 'jb3' of https://github.com/CarbonDev/android_packages_apps_CarbonFibers into HEAD
Derp fixes