Merge branch 'jb3' of https://github.com/CarbonDev/android_frameworks_base into jb3