Merge "simpleperf: fix location addresses in generated pprof files."