Merge "fbdev: msm: Fix systrace markers"