Add support for a s4-common vendor

Change-Id: Ic85319f6fc1464d9e266456ef0b77f429057b05a