Re-add upstream base16-builder