musl: merge changes from git, includes further getopt fixes