Clean up makefile now that we have fewer folders in v4

Change-Id: I785615ac75db36e92c307eb9d9afb00fe7fc40ae
1 file changed