Merge \"simpleperf: combine mapped buffer used for the same event and cpu.\"
am: 70e5ffea32

Change-Id: I4df54144afd5ada55a05c77f61c9ff3087bfbe1e