Merge "Move chmod of /sys/kernel/debug/tracing to fix tracing." am: 13c3a582de
am: c4f2163954

Change-Id: Iecf99f50cc1201ccd743bd72494dd35b55068aa1