BT Fix for Grouper - Tested Working
Merge branch 'jb2' of git://github.com/CarbonDev/android_build into jb2