Revert "vendorsetup: Grab from cm-11.0 build targets"

This reverts commit 763213a7eff4ca8ace750d82f70b624a151e1991.