ville: use s4-common ZSL setting

Change-Id: Ifc14d3b34f49fe6723a13f661963b7f327d18c74
ville: update extraction files for new s4-common vendor

Change-Id: Ibce525968e0324c14672f7e2173e8cc1c9486705
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1