Merge "Fix a build issue for --enable-intern-stats"