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

Change-Id: I15f0607b5a1f9973faeb3be3592dbddf93de3229