Fix Android 4.3 Merge

Thanks To PAC-man, ParanoidAndroid and CM
Merge branch 'jb-mr2' of https://github.com/ReVolt-ROM/frameworks_base into jb-mr2