Switch to cm, to fix build
Merge branch 'jb2' of https://github.com/deadman96385/android into jb2