Move contrib projects back in build-sandbox.make