Fix Android 4.3 Merge (Take 10)
Merge branch 'jb-mr2' of https://github.com/ReVolt-ROM/frameworks_base into HEAD