Merge "Fix linker compilation when STATS is set"