Correcting parsing of vendor make's

Change-Id: I52a0e132390f2cd40cc78535c8c387fa203ed29f