replace osutils macros with @static
#16219
+1,073
−867
Merged
@static
#16219