Add missing Symbol and clean up backup file
Merge branch 'jb-mr2' of https://github.com/ReVolt-ROM/frameworks_base into jb-mr2