Merge branch 'jb-mr2' of https://github.com/AICP/frameworks_base into jb-mr2