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

Change-Id: Ife392b80f83f15cce6cecfcbf94e60bad25dde63