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

Change-Id: Ibaad342c2b420eef59601a69fcfbeca51c3d1ac5