Merge "Allow access to tracing/per_cpu/cpu?/trace files." am: 978e43d7a1 am: 693e05d21a
am: a486981bff

Change-Id: I4a1802c8032c7b6e90385230002c911263f816f8