Merge "msm: kgsl: Fix compilation issues" into msm-4.9