Merge bootstrap changes from gnulib.