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

Change-Id: I3fbd4d1644d8fa170532edefee9833b904175ba5