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

Change-Id: I94690b74c8a6226461ddc4a87785d716e909debb