Merge "simpleperf: add an explicit "simpleperf" target."
am: 7ed6aabda8

Change-Id: I33a0e877ccd49127980fe0113e138189f5c16690