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

Change-Id: I9345d798fff5704304ee12255837a4e4f923db09