Merge "msm: kgsl: tracepoint cleanup" into msm-3.4