Revert "Hammerhead: move to new vendor config"

This reverts commit feaf9c21f4df2478d825f00a7cfcf67361993ecf.

Change-Id: I299617bd6872a66cd7f3b902b76e6df33953fcd0