s4-common: move common defines up to msm8960-common

Change-Id: I5f1cb7357a9e395399122d9dfadfe48c02b78e9f
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1