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

Change-Id: I768793d8233af502b97e7ec4515f1c6ebdfc139b