[25] Fix cyclic dependency issue with build-resources