Merge "Retire 64bitonly/product/vendor.mk" into main