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

Change-Id: Iec74a85c408fff23105212260a4fc0d439f41d2f