Merge "Revert "Revert "Remove GLTrace support"""