Merge "Initialize __progname correctly." am: 51aa2cfe79 am: 1cfb6b0835 am: af973d7cc3

Change-Id: I1b1826aff32413b1aae63b1110be7c221889c248