Merge "libarbitrarybytes: fix compiling errors"