Merge "Trace.h: explicitly use global namespace"
am: a8854d3460

Change-Id: Ia88b4a94e695ca935670dce8054a928960cad85f