Merge "Fix ATRACE_TAG redefinition in SysTrace.h"