Merge "simpleperf: adjust based on opencsd change."