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

Change-Id: I1c36c0d9136d953558ad6e70c276dbcbe93774d1