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

Change-Id: I699781e70a86357bd77f268d8b3264ac0a04ce72