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

Change-Id: I6684a4ab1891d364183100c4f01c34473516c153