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

Change-Id: Iba197142283890d4ba8c3902f73daa3e84469e68