Merge remote-tracking branch 'acme/perf-tools' into perf-tools-next

To pick up perf-tools fixes just merged upstream.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc tools/perf/builtin-stat.c
Simple merge

diff --cc tools/perf/util/stat.c
Simple merge

diff --cc tools/perf/util/stat.h
Simple merge