am 8ddef40d: am 59e9a496: Merge "__progname should be const char*, not char*."

# Via Android Git Automerger (1) and others
* commit '8ddef40dad42372ac5596d48f327f162745d7bb8':
  __progname should be const char*, not char*.