Merge "simpleperf: remove some deprecated code."
am: 04a648a9f0

Change-Id: I4642f376a6666c235b844bbaecb3b2aae4c9ea90