Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb43-legacy