Merge "Add /sys/kernel/tracing/trace_marker to whitelist"