update s4common too

Change-Id: I12d3e7815af0931b932ce3a090c0d2389a5c6866