s4-common: add missing include of proprietary defines

Change-Id: Iaa8fead868d2d3dfa13b85bf9c2420dba41fcd95
Merge remote-tracking branch 'cm/cm-10.1' into jb2