Merge "Temporarily disable avbHashtreeNotUsingSha1 due to false negatives"