am 97e156fc: am f0d21111: am bbbc7e26: am 6c368d28: Merge "Fix build - configure for schema-v4 output"

* commit '97e156fcd62cb9175d477b73eea3a96fbd4d17cf':
  Fix build - configure for schema-v4 output