Merge "Switch to current upstream getopt_long."