Fix duplicate/incorrect vendor file placement

Change-Id: Iacb16ac7ee4ee5c5c8e9ddd9673eb352941bf459