Merge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2 am: 4f5d2f4357
am: 3e74919c11

Change-Id: Id3c2a2d54fbf9f8181dc6777846d64ea9edea8fd