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

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