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

Change-Id: I29d9803bb8f445634f05b1068ad6cc34f2bf6f9b