Merge "Revert "simpleperf: add temporary work around for debug interface change.""