Fix merge errors.
Merge branch 'jb2' of github.com:CarbonDev/android_packages_apps_Settings into jb2