Merge "simpleperf: add inplace-sampler event type." am: a355220f81 am: 0da28de17a
am: c481862969

Change-Id: I1a27da43f38dfc012098d4ff79e9f6f3f172e295