Merge "simpleperf: fix location addresses in generated pprof files." am: 1720053bc5
am: 78fbfa7f26

Change-Id: Icb81e23d48d5047cad97375dd68814c905dab0bb