add some needed config
Merge branch 'jb-mr1' of https://github.com/Team-Kang-Droid/frameworks_base into jb-mr1