Merge "Add /sys/kernel/tracing/trace_marker to whitelist" am: e77dc7a00b

Change-Id: I8b5755d66f06de805f23678548c5ecb6f55eb7a9