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

Change-Id: Ie7e001f84d85d0384ffbde794a060506cbe47908