Merge "libutils: Trace.h for everything but windows"
am: 30a3b92c0e

Change-Id: I0f9f4a4576d50fdf053eb446d5aae749d4ecd20d