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

Change-Id: Ie72b19bc4a26e674ec216a2af286640888d5430a