msm8960: update headers to match kernel

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