Merge "simpleperf: Adjust callback for procinfo::ReadProcessMaps" am: c3476378f2
am: 328577af1c

Change-Id: I686616578dfc302fd638d2ac60434c2798c74865