Merge "simpleperf: support --clockid option in record cmd." am: 41e392642f am: 1cad85ba22 am: 6e63a5cc58
am: 10b07de069

Change-Id: I9e9584b69a7780d3945a5100dc72da9ee229874c