Merge from gnulib, for extern-inline.