Merge "Revert "Guard new APIs with __builtin_available"" into main