[armedbear-devel] Change in merge semantics which fixes loading CFFI