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

Change-Id: Iee29af6a320bc0cba96a522a4fb68b27b8d9faf1