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