s4-common: update all the things!

Change-Id: I879e310553d9e2c07ca02a2ac46e90b541c2c37f