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

Change-Id: I3fe8e36a890791342aff0630bf694ec9ed1f2092