Merge remote-tracking branch 'github-AOKP/jb-mr1' into jb-mr1
Merge branch 'jb-mr1' of https://github.com/legacy-aokp/frameworks_base into jb-mr1