Merge "Simpleperf: don't expose EventSelection." am: 9b20e8607c
am: 2a102b89cc

Change-Id: I99df3bdc605d0ebfdb05e9cc0a5bfd51ad5704d6