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

Change-Id: I4c2b7ab221dae6e47bfde72931ed758a84b2da3a