Merge "Revert to building builder-model from source"