Merge "libutils: Trace.h for everything but windows"