Merge "Sync with current upstream getopt_long.c."