Merge "Correct /sys/kernel/tracing permissions"