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

Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6