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

Change-Id: Id5385619fb674a92f05a3855e328ae48a458d852