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

Change-Id: Ie29b2c32c07476cb4ca46a7f99f16293876770d9