Update and rename 2 to totoro-vendor.mk