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

Change-Id: I9e50f7ffccc8817570ba0c27ada2695b06d80671