kgsl and video/msm from msm8960 2.5 branch