Merge "regen makefiles and delete old vts driver build rules"