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

Change-Id: If7485b6ccc4bf0ee62bad60399173ff235697f18