Merge "Take a getopt_long() patch from upstream FreeBSD."
am: d1f1e41d8c

Change-Id: I4fa2d5478a65537727f5b10532d7eed147d4230f