Merge "Check /sys/kernel/tracing for tracefs" am: a6c834f960

Change-Id: Ied26985b145eea03815c384bd225594dda7710e9