Merge "Perf: Add PMU names to perf output" into msm-3.4