Merge from gnulib, using build-aux to remove clutter.