Fork msm8960-common to fix includes