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

Change-Id: I82a74f322c38716f4ec1b14ed982f6a636edf051