Merge /u/mousezhang/perfmon2/ branch master into master

https://sourceforge.net/p/perfmon2/libpfm4/merge-requests/32/