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

Change-Id: I00e6d67eab71efc1595baa3d2568b5465362bf68