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

* commit '368e2eceb7c709179ca65560fbd7f91b5d010f50':
  atrace: avoid unnecessary writes to trace_clock