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

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