Carbonify.
Merge branch 'jb2' of git://github.com/CarbonDev/android_frameworks_base into jb2