s4-common: update for new camera libraries

Change-Id: I8c4154f9ee93f8e321408452d1662a245f7a308a