Merge "Support blake2b-256 in hashtree builder"