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

Change-Id: I602d45c75feb39040caa099f9f1f38cf1a57db7e