Merge "simpleperf: Adjust callback for procinfo::ReadProcessMaps"