Merge "Prevent NetworkTraceHandlerTest from touching BPF."