Merge "Set host and device arches from product variables"