Use proper vendor inherit file

Change-Id: I2d2124ce28113f364538c5abfb7caecb3b55d68e