Merge changes Ic9b9cef4,I5e807b64

* changes:
  atrace: don't write the clock sync marker if --only_userspace
  atrace: don't hard-fail if one of the categories doesn't exist