Nightlies: fix common dependencies on evita and n1

Change-Id: I7d33138529a531a69dd691a9a7b91e9ef1947884