merge latest cm11 commits and Pimped-caf