Merge "Stop defining __STDC_*_MACROS macros." into main