Revert "Remove vendor folders for devices that were consolidated"

This reverts commit d13d7bc946cb3f42c7f55b213d2fbc0f68af9ff4.