Update project builder to use new libs