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

Change-Id: I6e06c280621f63413565edd1301df64bba130953