Merge "Stop defining __STDC_LIMIT_MACROS." into main