Merge "Make system_server atrace category work with traced_probes"