Merge "simpleperf: fix callchains generated by the kernel." am: d1dd064d3e
am: 7b50acb4bd

Change-Id: I1899d0734d8fc28c1f7d8ade81d27e2554e8c9ce