Merge "Initialize __progname correctly."
am: 51aa2cfe79

Change-Id: Ie1b2ce4e16a088a9a0533d09b9a85300bb3c628d