Merge "simpleperf: use per process maps." am: c35b5e2d4f am: e594679674 am: 05cb0b3a48
am: b42d3daa2a

Change-Id: Ic709bb45b1e58aaadd8fa30e29e32e68a837b568