Fix vendor and rename makefile

Change-Id: Icfdc94c7465f380959b13e57da48566ccdd16e2c