am 0d08d778: am 4c033e39: Merge "verity: move metadata after the hash tree"

* commit '0d08d778ea9751da404a300ca59dd88087cc08c1':
  verity: move metadata after the hash tree