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

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