Some bug fixes for perf stat metrics

[Andi Kleen]

Fix some bugs and regressions in perf stat --metrics support.

Also available in 

git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc perf/metric-fixes-1