Revert "Sync evita device tree back to CM's latest updates"

This reverts commit e1ddcf35653bc6628bcb600c3fcd2e83b0cf3228.