Revert "Add vendor props for tuna/toro."

This reverts commit ffcf0d79719a97bd2fe1a1c88e0462a3c993f851.

Change-Id: I9cea4496b6a1f54bad87d8c619d6d8e73c971a6a