Merge "Perf: Extend named-pmu grammar" into msm-3.4