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

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