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

Change-Id: Ia247e86eaedc0568fd0291cebb7e15c6aa2e4186