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

Change-Id: I0a288a291e9a986b0029755c29568a370aa877fc