Merge "msm: kgsl: add power tracepoints" into msm-3.0