Merge "Correct /sys/kernel/tracing permissions" am: 1fad2b39a3 am: fb4209d8ee

Change-Id: I14b25ec39a273b53aedec1d9112343e32ae89299