am b116bf76: Merge "Switch to current upstream getopt_long."

* commit 'b116bf76286178a7d552c4d0a72b79212c8c93d1':
  Switch to current upstream getopt_long.