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

Change-Id: I7f48f45cc5e1274cd4c2ca0d4b5f42cb07237bce