am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

* commit 'cecfb94f3f1b2978ba66342d7920e83770c808e3':
  Clean up argc / argv processing for runtime args.