Merge "libcutils must check /sys/kernel/tracing for tracefs first"