Revert "Removed vendor-common"

This reverts commit 15fe37adca1490ba9954beee926b2265d367b7dc.