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

Change-Id: I511d370eadb5b1788300cf79fd25070610c25391