Return evita and ville to cm-10.2

* The 4.4.1 merge renders these devices completely unusable as they
  continuously reboot.
Merge pull request #167 from intervigilium/master

Return evita and ville to cm-10.2