am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verity metadata"

* commit '3fdc2f2be80071eb510ad5e33e9f967d7e946b0f':
  Use structured format for verity metadata