Merge "Add support of more hash algorithms for verity tree builder"
am: bdb1bfde6e

Change-Id: Ifbcb3f07ed8445b682e8e3a93d02bf651ceed66a