evita: Update for 4.2

Change-Id: Ic17f51040b7c70b787263c4f5b25a076ea68046b