Merge "simpleperf: handle monitored processes correctly when a cpu is up." am: 25bbfdede1
am: 1edf3e586d

Change-Id: I2fcbc03bb1170dfba625574a7db214aa1d5aff53