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

* commit '4c033e392e8b8d92f876b8ab46df14e4268d006b':
  verity: move metadata after the hash tree