Merge "msm: kgsl: Fix compilation errors when CFF is turned on"