am 0faebfb2: Merge "Add trace_event_clock_sync to atrace"

* commit '0faebfb2f5a07939e7264a94fdcebecc4df39873':
  Add trace_event_clock_sync to atrace