Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""