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

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