Merge "simpleperf: fix excluding kernel callchains when --trace-offcpu is used." am: 3a0dc00842
am: 16cf83232d

Change-Id: I26bcea2b2365a2cfd8c02ef9fd1790154570e9c5