s4-common: add secondary dependencies

Change-Id: I5e7062bde61d0f62ff189ff7e3e97578c39ef0d3