evita: use s4-common ZSL setting

Change-Id: Ib652f024f7fc1d169b0c4d9f0b3d3ca82ae97925
evita: update extraction files for new s4-common vendor

Change-Id: I8be590f054585acbd2a4229c1fd948bcc75b4f5a
Merge remote-tracking branch 'cm/cm-10.1' into HEAD