am 61a4eecb: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev

* commit '61a4eecbe615bc94944161c4cf4aa590dfca1b2e':
  atrace: avoid unnecessary writes to trace_clock