Merge "Add trace_event_clock_sync to atrace"