[polymer] Merge of master into polymer10-migration

systrace/systrace/tracing_agents/atrace_agent.py

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 import py_utils
 import subprocess
 import sys
 import threading
 import zlib
@@ skipping 180 matching lines @@
 
   def SupportsExplicitClockSync(self):
     return True
 
   def RecordClockSyncMarker(self, sync_id, did_record_sync_marker_callback):
     """Records a clock sync marker.
 
     Args:
         sync_id: ID string for clock sync marker.
     """
-    cmd = 'echo name=%s > /sys/kernel/debug/tracing/trace_marker' % sync_id
+    cmd = 'echo trace_event_clock_sync: name=%s >' \
+        ' /sys/kernel/debug/tracing/trace_marker' % sync_id
     with self._device_utils.adb.PersistentShell(
         self._device_serial_number) as shell:
       t1 = trace_time.Now()
       shell.RunCommand(cmd, close=True)
       did_record_sync_marker_callback(t1, sync_id)
 
   def _dump_trace(self):
     """Dumps the atrace buffer and returns the dumped buffer."""
     dump_cmd = self._tracer_args + ['--async_dump']
     return self._device_utils.RunShellCommand(dump_cmd, raw_output=True)
@@ skipping 288 matching lines @@
       serial: Serial number of device.
   """
 
   args = [command]
   dump, ret_code = util.run_adb_shell(args, serial)
   if ret_code != 0:
     return None
 
   dump = ''.join(dump)
   return dump