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