Make the libpfm3 predefined events parser identical to the libpfm4 one, in preparation for a merge.
Make the libpfm3 predefined events parser identical to the libpfm4
one, in preparation for a merge.

arm-hpc/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,pyrovski/papi,arm-hpc/papi,pyrovski/papi