Merge "Support blake2b-256 in hashtree builder" am: f7574574bd

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1606633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55dd6e5e8b054a9009d2245f337f7db2a6450925