Revert "Merge branch 'jb-mr2' of github.com:AOKP/frameworks_native into jb-mr2"

This reverts commit 8e277e57942a9f8109a52e65589c04ee1e6232f4, reversing
changes made to bb7c1757fc5563afa48f63a1a6423d5e41716e4b.