Roll back to cm
Merge branch 'kitkat' of github.com:C-RoM-KK/android into kitkat