Merge "simpleperf: remove code not in use." am: 58a4d50ece
am: 01b7143d30

Change-Id: I12a2bbaa4f02fefdcb972085992eb48c13f565d7