Merge "trace-container: Check /sys/kernel/tracing for tracefs" am: 1ac1d86b7d am: 0b9ed14c89

Change-Id: I99cda8b9d2a8faa402be4960cbfba60646a65e0d