Sync evita device tree back to CM's latest updates