Merge "remove additional unused v1 build rules"