Merge "simpleperf: adjust based on opencsd change." am: 4d1a421368

Change-Id: I51e861f8839f0bbc046be9badee0308e68dfd8bb