Use ParserOutput::addTrackingCategory()

New in 1.25

Change-Id: Iae835d2d8b80a9962d6fe5cefa66e1e8c21353a2
Merge "Use ParserOutput::addTrackingCategory()"