Merge "Fix the arguments passed to getopt_long(3)." am: 29932e7bcc am: 2f9d61ad25
am: af80f51151

Change-Id: I77c4ab2fe08a293edf94004747e8b82f21d383ac