Merge "Cherrypick upstream fnmatch.c fix."