Merge "Create CSI products: csi_x86_64 and csi_arm"