Build fix
Merge branch 'jb43' of github.com:ModdedPA/android_frameworks_base into jb43