Fix merge errors.
Merge branch 'jb2' of github.com:CarbonDev/android_frameworks_base into jb2-PIE