Merge "simpleperf: calculate perf clock based on system clock." am: 0b49810b7c
am: 85b29cc7a6

Change-Id: Ib6dc526d476bc8122514102a326a8d469497eec1